niansa-misc/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2025-03-06 20:48:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Get rid of MapblockMeshGenerator::cur_node.light

Browse source
This commit is contained in:
Desour 2025-01-07 15:08:22 +01:00 • committed by DS
parent c4bfa65201
commit 7ba5973108
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/client/content_mapblock.cpp
View file

@ -542,19 +542,20 @@ void MapblockMeshGenerator::prepareLiquidNodeDrawing()
if (data->m_smooth_lighting) if (data->m_smooth_lighting)
return; // don't need to pre-compute anything in this case return; // don't need to pre-compute anything in this case
auto light = LightPair(getInteriorLight(cur_node.n, 0, nodedef));
if (cur_node.f->light_source != 0) { if (cur_node.f->light_source != 0) {
// If this liquid emits light and doesn't contain light, draw // If this liquid emits light and doesn't contain light, draw
// it at what it emits, for an increased effect // it at what it emits, for an increased effect
u8 e = decode_light(cur_node.f->light_source); u8 e = decode_light(cur_node.f->light_source);
cur_node.light = LightPair(std::max(e, cur_node.light.lightDay), light = LightPair(std::max(e, light.lightDay),
std::max(e, cur_node.light.lightNight)); std::max(e, light.lightNight));
} else if (nodedef->getLightingFlags(ntop).has_light) { } else if (nodedef->getLightingFlags(ntop).has_light) {
// Otherwise, use the light of the node on top if possible // Otherwise, use the light of the node on top if possible
cur_node.light = LightPair(getInteriorLight(ntop, 0, nodedef)); light = LightPair(getInteriorLight(ntop, 0, nodedef));
} }
cur_liquid.color_top = encode_light(cur_node.light, cur_node.f->light_source); cur_liquid.color_top = encode_light(light, cur_node.f->light_source);
cur_node.color = encode_light(cur_node.light, cur_node.f->light_source); cur_node.color = encode_light(light, cur_node.f->light_source);
} }
void MapblockMeshGenerator::getLiquidNeighborhood() void MapblockMeshGenerator::getLiquidNeighborhood()
@ -1267,8 +1268,8 @@ void MapblockMeshGenerator::drawPlantlikeRootedNode()
getSmoothLightFrame(); getSmoothLightFrame();
} else { } else {
MapNode ntop = data->m_vmanip.getNodeNoEx(blockpos_nodes + cur_node.p); MapNode ntop = data->m_vmanip.getNodeNoEx(blockpos_nodes + cur_node.p);
cur_node.light = LightPair(getInteriorLight(ntop, 0, nodedef)); auto light = LightPair(getInteriorLight(ntop, 0, nodedef));
cur_node.color = encode_light(cur_node.light, cur_node.f->light_source); cur_node.color = encode_light(light, cur_node.f->light_source);
} }
drawPlantlike(tile, true); drawPlantlike(tile, true);
cur_node.p.Y--; cur_node.p.Y--;
@ -1748,8 +1749,8 @@ void MapblockMeshGenerator::drawNode()
if (data->m_smooth_lighting) { if (data->m_smooth_lighting) {
getSmoothLightFrame(); getSmoothLightFrame();
} else { } else {
cur_node.light = LightPair(getInteriorLight(cur_node.n, 0, nodedef)); auto light = LightPair(getInteriorLight(cur_node.n, 0, nodedef));
cur_node.color = encode_light(cur_node.light, cur_node.f->light_source); cur_node.color = encode_light(light, cur_node.f->light_source);
} }
switch (cur_node.f->drawtype) { switch (cur_node.f->drawtype) {
case NDT_FLOWINGLIQUID: drawLiquidNode(); break; case NDT_FLOWINGLIQUID: drawLiquidNode(); break;

1
src/client/content_mapblock.h
View file

@ -63,7 +63,6 @@ private:
v3f origin; v3f origin;
MapNode n; MapNode n;
const ContentFeatures *f; const ContentFeatures *f;
LightPair light;
LightFrame frame; LightFrame frame;
video::SColor color; video::SColor color;
} cur_node; } cur_node;