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

[ServerChunk] Only update light with all neighbours.

Browse Source 
Also wait for m_readyToSend to be true.
This commit is contained in:
Quentin Bazin 2021-05-17 21:30:46 +02:00
parent 1ea2c350e4
commit 0144b928b3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/server/world/ServerChunk.cpp
View File

@ -41,7 +41,8 @@ ServerChunk::ServerChunk(s32 x, s32 y, s32 z, ServerWorld &world) : Chunk(x, y,
}
void ServerChunk::update() {
m_lightmap.updateLights();
if (areAllNeighboursInitialized())
m_lightmap.updateLights();
if (m_hasChanged || m_lightmap.hasChanged()) {
// gkDebug() << "Chunk update at" << m_x << m_y << m_z << "| D:" << m_hasChanged << "| L:" << m_lightmap.hasChanged();
@ -49,7 +50,7 @@ void ServerChunk::update() {
m_hasChanged = false;
m_lightmap.resetChangedFlag();
if (m_isInitialized)
if (m_isInitialized && m_isReadyToSend)
m_world.addChunkToProcess(this);
}
}

3
source/server/world/ServerChunk.hpp
View File

@ -57,12 +57,15 @@ class ServerChunk : public Chunk {
bool hasBeenModified() const { return m_hasBeenModified; }
void setModified(bool hasBeenModified) { m_hasBeenModified = hasBeenModified; }
void setReadyToSend() { m_isReadyToSend = true; }
void addTickingBlock(int x, int y, int z, const ServerBlock &block) { m_tickingBlocks.emplace(gk::Vector3i{x, y, z}, block); }
private:
ServerWorld &m_world;
bool m_hasBeenModified = false;
bool m_isReadyToSend = false;
Random_t m_random;