TheZone/ScuffedMinecraft
1
0
Fork 0
Code Issues 7 Pull Requests 4 Actions Packages Projects Releases 5 Wiki Activity

iterator erase fix and improved readability

Browse Source
This commit is contained in:
Argore 2024-11-05 17:00:17 +01:00
parent ccacb3088f
commit 261b2540e0
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ScuffedMinecraft/src/Planet.cpp
View File

@ -39,13 +39,15 @@ void Planet::Update(glm::vec3 cameraPos)
{
numChunks++;
if (!(*it->second).ready)
Chunk& chunk = *it->second;
if (!chunk.ready)
chunksLoading++;
int chunkX = (*it->second).chunkPos.x;
int chunkY = (*it->second).chunkPos.y;
int chunkZ = (*it->second).chunkPos.z;
if ((*it->second).ready && (abs(chunkX - camChunkX) > renderDistance ||
int chunkX = chunk.chunkPos.x;
int chunkY = chunk.chunkPos.y;
int chunkZ = chunk.chunkPos.z;
if ( chunk.ready && (abs(chunkX - camChunkX) > renderDistance ||
abs(chunkY - camChunkY) > renderDistance ||
abs(chunkZ - camChunkZ) > renderDistance))
{
@ -60,13 +62,13 @@ void Planet::Update(glm::vec3 cameraPos)
chunkDataDeleteQueue.push({ chunkX, chunkY, chunkZ - 1 });
// Delete chunk
delete it->second;
delete it->second; // &chunk
it = chunks.erase(it);
}
else
{
numChunksRendered++;
(*it->second).Render(solidShader, billboardShader);
chunk.Render(solidShader, billboardShader);
++it;
}
}
@ -75,11 +77,13 @@ void Planet::Update(glm::vec3 cameraPos)
waterShader->use();
for (auto it = chunks.begin(); it != chunks.end(); )
{
int chunkX = (*it->second).chunkPos.x;
int chunkY = (*it->second).chunkPos.y;
int chunkZ = (*it->second).chunkPos.z;
Chunk& chunk = *it->second;
(*it->second).RenderWater(waterShader);
int chunkX = chunk.chunkPos.x;
int chunkY = chunk.chunkPos.y;
int chunkZ = chunk.chunkPos.z;
chunk.RenderWater(waterShader);
++it;
}
@ -102,10 +106,13 @@ void Planet::ChunkThreadUpdate()
chunks.find({ pos.x, pos.y, pos.z + 1 }) == chunks.end() &&
chunks.find({ pos.x, pos.y, pos.z - 1 }) == chunks.end())
{
delete chunkData.at(pos);
chunkData.erase(pos);
delete it->second;
it = chunkData.erase( it );
}
else
{
++it;
}
++it;
}
// Check if camera moved to new chunk