Unarelith/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ClientWorld] Client still needs to remove empty chunks it creates.

Browse Source
This commit is contained in:
Quentin Bazin 2021-05-16 17:38:02 +02:00
parent ee03d64254
commit 25569da358
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/client/world/ClientWorld.cpp
View File

@ -46,14 +46,21 @@ ClientWorld::ClientWorld() : m_textureAtlas(gk::ResourceHandler::getInstance().g
void ClientWorld::update(bool allowWorldReload) {
// Update loaded chunks
std::list<gk::Vector3i> chunksToRemove;
for (auto &it : m_chunks) {
if (World::isReloadRequested && allowWorldReload)
it.second->setChanged(true);
if (it.second->isReadyForMeshing())
it.second->update();
if (it.second->isTooFar() && !it.second->isInitialized())
chunksToRemove.emplace_back(gk::Vector3i{it.second->x(), it.second->y(), it.second->z()});
}
for (auto &it : chunksToRemove)
removeChunk(it);
if (allowWorldReload)
World::isReloadRequested = false;
@ -174,15 +181,10 @@ void ClientWorld::removeChunk(const gk::Vector3i &chunkPos) {
m_chunks.erase(it);
for (u8 i = 0 ; i < 6 ; ++i) {
if (surroundingChunks[i]) {
for (u8 i = 0 ; i < 6 ; ++i)
if (surroundingChunks[i])
surroundingChunks[i]->setSurroundingChunk((i % 2 == 0) ? i + 1 : i - 1, nullptr);
if (!surroundingChunks[i]->isTooFar())
createChunkNeighbours(surroundingChunks[i]);
}
}
// gkDebug() << "Chunk at" << chunkPos.x << chunkPos.y << chunkPos.z << "removed";
}