PowerOlive
/
spheretest-1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix non-smooth non-shader node shading (Fixes #1436, regression by commit a0f78659f3)

master
Perttu Ahola 2014-07-06 21:57:12 +03:00
parent eadde1e741
commit 9b44bbd0a6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mapblock_mesh.cpp
View File

@ -1293,6 +1293,7 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat
bool enable_shaders = g_settings->getBool("enable_shaders"); bool enable_shaders = g_settings->getBool("enable_shaders");
bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping"); bool enable_bumpmapping = g_settings->getBool("enable_bumpmapping");
bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion"); bool enable_parallax_occlusion = g_settings->getBool("enable_parallax_occlusion");
bool smooth_lighting = g_settings->getBool("smooth_lighting");
if(!m_has_animation) if(!m_has_animation)
{ {
@ -1406,6 +1407,9 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat
u8 night = j->second.second; u8 night = j->second.second;
finalColorBlend(vertices[vertexIndex].Color, finalColorBlend(vertices[vertexIndex].Color,
day, night, daynight_ratio); day, night, daynight_ratio);
// If no smooth lighting, shading is already correct
if(!smooth_lighting)
continue;
// Make sides and bottom darker than the top // Make sides and bottom darker than the top
video::SColor &vc = vertices[vertexIndex].Color; video::SColor &vc = vertices[vertexIndex].Color;
if(vertices[vertexIndex].Normal.Y > 0.5) { if(vertices[vertexIndex].Normal.Y > 0.5) {