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

[ServerWorld|ChunkLightmap|ServerChunk] Removed useless updateLight() calls.

Browse Source
This commit is contained in:
Quentin Bazin 2020-01-19 17:29:04 +09:00
parent b43e539742
commit 1a8698b97b
4 changed files with 75 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/include/world/ChunkLightmap.hpp
View File

@ -46,9 +46,9 @@ class ChunkLightmap {
void removeTorchlight(int x, int y, int z);
void removeSunlight(int x, int y, int z);
void updateLights();
void updateTorchlight();
void updateSunlight();
bool updateLights();
bool updateTorchlight();
bool updateSunlight();
u8 getLightData(int x, int y, int z) const { return m_lightMap[x][y][z]; }
u8 getSunlight(int x, int y, int z) const;
@ -67,9 +67,9 @@ class ChunkLightmap {
using LightMapArray = u8[CHUNK_WIDTH][CHUNK_HEIGHT][CHUNK_DEPTH];
LightMapArray m_lightMap;
std::queue<LightNode> m_lightBfsQueue;
std::queue<LightNode> m_torchlightBfsQueue;
std::queue<LightNode> m_sunlightBfsQueue;
std::queue<LightRemovalNode> m_lightRemovalBfsQueue;
std::queue<LightRemovalNode> m_torchlightRemovalBfsQueue;
std::queue<LightRemovalNode> m_sunlightRemovalBfsQueue;
};

99
common/source/world/ChunkLightmap.cpp
View File

@ -32,7 +32,7 @@ void ChunkLightmap::addTorchlight(int x, int y, int z, int val) {
if(z >= CHUNK_DEPTH) { if(m_chunk->getSurroundingChunk(3)) m_chunk->getSurroundingChunk(3)->lightmap().addTorchlight(x, y, z - CHUNK_DEPTH, val); return; }
setTorchlight(x, y, z, val);
m_lightBfsQueue.emplace(x, y, z);
m_torchlightBfsQueue.emplace(x, y, z);
}
void ChunkLightmap::addSunlight(int x, int y, int z, int val) {
@ -55,7 +55,7 @@ void ChunkLightmap::removeTorchlight(int x, int y, int z) {
if(z < 0) { if(m_chunk->getSurroundingChunk(2)) m_chunk->getSurroundingChunk(2)->lightmap().removeTorchlight(x, y, z + CHUNK_DEPTH); return; }
if(z >= CHUNK_DEPTH) { if(m_chunk->getSurroundingChunk(3)) m_chunk->getSurroundingChunk(3)->lightmap().removeTorchlight(x, y, z - CHUNK_DEPTH); return; }
m_lightRemovalBfsQueue.emplace(x, y, z, getTorchlight(x, y, z));
m_torchlightRemovalBfsQueue.emplace(x, y, z, getTorchlight(x, y, z));
setTorchlight(x, y, z, 0); // FIXME
}
@ -71,23 +71,19 @@ void ChunkLightmap::removeSunlight(int x, int y, int z) {
setSunlight(x, y, z, 0); // FIXME
}
void ChunkLightmap::updateLights() {
updateTorchlight();
updateSunlight();
bool ChunkLightmap::updateLights() {
bool torchlightUpdated = updateTorchlight();
bool sunlightUpdated = updateSunlight();
return torchlightUpdated || sunlightUpdated;
}
void ChunkLightmap::updateTorchlight() {
while (!m_lightRemovalBfsQueue.empty()) {
LightRemovalNode node = m_lightRemovalBfsQueue.front();
m_lightRemovalBfsQueue.pop();
bool ChunkLightmap::updateTorchlight() {
bool lightUpdated = false;
// If this block is opaque, don't propagate the light
u16 block = m_chunk->getBlock(node.x, node.y, node.z);
if (!(!block || block == BlockType::Water || block == BlockType::Glass || block == BlockType::Flower
/* || !Registry::getInstance().getBlock(block).isOpaque() */)) { // FIXME
setTorchlight(node.x, node.y, node.z, 0);
continue;
}
while (!m_torchlightRemovalBfsQueue.empty()) {
LightRemovalNode node = m_torchlightRemovalBfsQueue.front();
m_torchlightRemovalBfsQueue.pop();
gk::Vector3i surroundingNodes[6] = {
{node.x - 1, node.y, node.z},
@ -103,16 +99,35 @@ void ChunkLightmap::updateTorchlight() {
if (level != 0 && level < node.value) {
setTorchlight(surroundingNode.x, surroundingNode.y, surroundingNode.z, 0);
m_lightRemovalBfsQueue.emplace(surroundingNode.x, surroundingNode.y, surroundingNode.z, level);
m_torchlightRemovalBfsQueue.emplace(surroundingNode.x, surroundingNode.y, surroundingNode.z, level);
lightUpdated = true;
}
else if (level >= node.value) {
m_lightBfsQueue.emplace(surroundingNode.x, surroundingNode.y, surroundingNode.z);
m_torchlightBfsQueue.emplace(surroundingNode.x, surroundingNode.y, surroundingNode.z);
lightUpdated = true;
}
}
}
while (!m_lightBfsQueue.empty()) {
LightNode node = m_lightBfsQueue.front();
m_lightBfsQueue.pop();
while (!m_torchlightBfsQueue.empty()) {
LightNode node = m_torchlightBfsQueue.front();
m_torchlightBfsQueue.pop();
// FIXME: This doesn't check if the block is an actual light source
// so if this block is a light source, it'll just remove the light
// If this block is opaque, don't propagate the light
// u16 block = m_chunk->getBlock(node.x, node.y, node.z);
// if (!(!block || block == BlockType::Water || block == BlockType::Glass || block == BlockType::Flower
// /* || !Registry::getInstance().getBlock(block).isOpaque() */)) { // FIXME
// setTorchlight(node.x, node.y, node.z, 0);
//
// lightUpdated = true; // FIXME
//
// continue;
// }
gk::Vector3i surroundingNodes[6] = {
{node.x - 1, node.y, node.z},
@ -130,13 +145,19 @@ void ChunkLightmap::updateTorchlight() {
if (!block || block == BlockType::Water || block == BlockType::Glass || block == BlockType::Flower
/* || !Registry::getInstance().getBlock(block).isOpaque() */) { // FIXME
addTorchlight(surroundingNode.x, surroundingNode.y, surroundingNode.z, lightLevel - 1);
lightUpdated = true;
}
}
}
}
return lightUpdated;
}
void ChunkLightmap::updateSunlight() {
bool ChunkLightmap::updateSunlight() {
bool lightUpdated = false;
while (!m_sunlightRemovalBfsQueue.empty()) {
LightRemovalNode node = m_sunlightRemovalBfsQueue.front();
m_sunlightRemovalBfsQueue.pop();
@ -156,9 +177,13 @@ void ChunkLightmap::updateSunlight() {
setSunlight(surroundingNode.x, surroundingNode.y, surroundingNode.z, 0);
m_sunlightRemovalBfsQueue.emplace(surroundingNode.x, surroundingNode.y, surroundingNode.z, level);
lightUpdated = true;
}
else if (level >= node.value) {
m_sunlightBfsQueue.emplace(surroundingNode.x, surroundingNode.y, surroundingNode.z);
lightUpdated = true;
}
}
}
@ -172,6 +197,11 @@ void ChunkLightmap::updateSunlight() {
if (!(!block || block == BlockType::Water || block == BlockType::Glass || block == BlockType::Flower
/* || !Registry::getInstance().getBlock(block).isOpaque() */)) { // FIXME
setSunlight(node.x, node.y, node.z, 0);
// FIXME: This only reverts an addSunlight that added light in a non-generated chunk
// I should avoid setting the sunlight rather than reverting it
lightUpdated = true;
continue;
}
@ -186,22 +216,33 @@ void ChunkLightmap::updateSunlight() {
u8 sunlightLevel = getSunlight(node.x, node.y, node.z);
for (const gk::Vector3i &surroundingNode : surroundingNodes) {
if (getSunlight(surroundingNode.x, surroundingNode.y, surroundingNode.z) + 2 <= sunlightLevel
|| (sunlightLevel == 15 && surroundingNode.y == node.y - 1)) {
u8 neighbourSunlightLevel = getSunlight(surroundingNode.x, surroundingNode.y, surroundingNode.z);
if (neighbourSunlightLevel + 2 <= sunlightLevel
|| (sunlightLevel == 15 && neighbourSunlightLevel != 15 && surroundingNode.y == node.y - 1)) {
u16 block = m_chunk->getBlock(surroundingNode.x, surroundingNode.y, surroundingNode.z);
if (!block || block == BlockType::Water || block == BlockType::Glass || block == BlockType::Flower
/* || !Registry::getInstance().getBlock(block).isOpaque() */) { // FIXME
if (sunlightLevel == 15 && surroundingNode.y == node.y - 1)
if (sunlightLevel == 15 && surroundingNode.y == node.y - 1) {
addSunlight(surroundingNode.x, surroundingNode.y, surroundingNode.z, sunlightLevel);
lightUpdated = true;
}
else if (sunlightLevel == 15 && surroundingNode.y == node.y + 1)
continue;
else
else {
addSunlight(surroundingNode.x, surroundingNode.y, surroundingNode.z, sunlightLevel - 1);
// FIXME: If addSunlight changes something in a surrounding chunk
// then this flag should be set on this other chunk
lightUpdated = true;
}
}
}
}
}
return lightUpdated;
}
u8 ChunkLightmap::getSunlight(int x, int y, int z) const {
@ -234,8 +275,6 @@ void ChunkLightmap::setLightData(int x, int y, int z, u8 val) {
updateSurroundingChunks(x, y, z);
}
// #include <gk/core/Debug.hpp> // FIXME
void ChunkLightmap::setSunlight(int x, int y, int z, u8 val) {
if(x < 0) { if(m_chunk->getSurroundingChunk(0)) m_chunk->getSurroundingChunk(0)->lightmap().setSunlight(x + CHUNK_WIDTH, y, z, val); return; }
if(x >= CHUNK_WIDTH) { if(m_chunk->getSurroundingChunk(1)) m_chunk->getSurroundingChunk(1)->lightmap().setSunlight(x - CHUNK_WIDTH, y, z, val); return; }
@ -249,10 +288,6 @@ void ChunkLightmap::setSunlight(int x, int y, int z, u8 val) {
m_chunk->setChanged(true);
updateSurroundingChunks(x, y, z);
// if (m_chunk->x() == 1 && m_chunk->z() == 0 && x == 0 && z == 14)
// if (m_chunk->x() == 1 && m_chunk->z() == 0 && y == 20 && z == 14)
// DEBUG("In chunk", m_chunk->x(), m_chunk->y(), m_chunk->z(), "setting sunlight at block", x, y, z, "to", (int)val);
};
void ChunkLightmap::setTorchlight(int x, int y, int z, u8 val) {

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

@ -22,14 +22,11 @@ void ServerChunk::generate() {
m_terrainGenerator.generate(*this);
m_isGenerated = true;
m_hasChanged = true;
}
}
void ServerChunk::updateLights() {
if (m_hasChanged) {
m_lightmap.updateLights();
m_hasChanged = false;
if (m_lightmap.updateLights()) {
m_isSent = false;
}
}

2
server/source/world/ServerWorld.cpp
View File

@ -61,6 +61,8 @@ void ServerWorld::sendSpawnData(Client &client, ServerPlayer &player) {
// If the chunk is already generated, update lights and send it
if (chunk->isGenerated()) {
// DEBUG("Updating lights in chunk at", chunk->x(), chunk->y(), chunk->z());
chunk->updateLights();
if (!chunk->isSent())