Restore finalColorBlend implementation in shaders.

[oweals/minetest.git] / src / mapblock_mesh.cpp

diff --git a/src/mapblock_mesh.cpp b/src/mapblock_mesh.cpp
index 193fea3289071befc39ceec49ef41408f522968e..0ca24a1f919b2f847142f354198edb4a5415c4a3 100644 (file)
--- a/src/mapblock_mesh.cpp
+++ b/src/mapblock_mesh.cpp
@@ -245,7 +245,7 @@ static u16 getSmoothLightCombined(v3s16 p, MeshMakeData *data)
        u16 light_day = 0;
        u16 light_night = 0;
 
-       for(u32 i = 0; i < 8; i++)
+       for (u32 i = 0; i < 8; i++)
        {
                MapNode n = data->m_vmanip.getNodeNoEx(p - dirs8[i]);
 
@@ -255,10 +255,9 @@ static u16 getSmoothLightCombined(v3s16 p, MeshMakeData *data)
                }
 
                const ContentFeatures &f = ndef->get(n);
-               if(f.light_source > light_source_max)
+               if (f.light_source > light_source_max)
                        light_source_max = f.light_source;
-               // Check f.solidness because fast-style leaves look
-               // better this way
+               // Check f.solidness because fast-style leaves look better this way
                if (f.param_type == CPT_LIGHT && f.solidness != 2) {
                        light_day += decode_light(n.getLight(LIGHTBANK_DAY, ndef));
                        light_night += decode_light(n.getLight(LIGHTBANK_NIGHT, ndef));
@@ -275,25 +274,31 @@ static u16 getSmoothLightCombined(v3s16 p, MeshMakeData *data)
        light_night /= light_count;
 
        // Boost brightness around light sources
-       bool skip_ambient_occlusion = false;
+       bool skip_ambient_occlusion_day = false;
        if(decode_light(light_source_max) >= light_day) {
                light_day = decode_light(light_source_max);
-               skip_ambient_occlusion = true;
+               skip_ambient_occlusion_day = true;
        }
+
+       bool skip_ambient_occlusion_night = false;
        if(decode_light(light_source_max) >= light_night) {
                light_night = decode_light(light_source_max);
-               skip_ambient_occlusion = true;
+               skip_ambient_occlusion_night = true;
        }
 
-       if(ambient_occlusion > 4 && !skip_ambient_occlusion)
+       if (ambient_occlusion > 4)
        {
-               //calculate table index for gamma space multiplier
-               ambient_occlusion -= 5;
                //table of precalculated gamma space multiply factors
                //light^2.2 * factor (0.75, 0.5, 0.25, 0.0), so table holds factor ^ (1 / 2.2)
-               static const float light_amount[4] = {0.877424315, 0.729740053, 0.532520545, 0.0};
-               light_day = rangelim(core::round32(light_day*light_amount[ambient_occlusion]), 0, 255);
-               light_night = rangelim(core::round32(light_night*light_amount[ambient_occlusion]), 0, 255);
+               static const float light_amount[4] = { 0.877424315, 0.729740053, 0.532520545, 0.0 };
+
+               //calculate table index for gamma space multiplier
+               ambient_occlusion -= 5;
+
+               if (!skip_ambient_occlusion_day)
+                       light_day = rangelim(core::round32(light_day*light_amount[ambient_occlusion]), 0, 255);
+               if (!skip_ambient_occlusion_night)
+                       light_night = rangelim(core::round32(light_night*light_amount[ambient_occlusion]), 0, 255);
        }
 
        return light_day | (light_night << 8);
@@ -1157,12 +1162,16 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset):
                                        applyFacesShading (vc, 0.836660);
                                }
                        }
-                       // - Classic lighting
-                       // Set initial real color and store for later updates
-                       u8 day = vc.getRed();
-                       u8 night = vc.getGreen();
-                       finalColorBlend(vc, day, night, 1000);
-                       m_daynight_diffs[i][j] = std::make_pair(day, night);
+                       if(!m_enable_shaders)
+                       {
+                               // - Classic lighting (shaders handle this by themselves)
+                               // Set initial real color and store for later updates
+                               u8 day = vc.getRed();
+                               u8 night = vc.getGreen();
+                               finalColorBlend(vc, day, night, 1000);
+                               if(day != night)
+                                       m_daynight_diffs[i][j] = std::make_pair(day, night);
+                       }
                }
 
                // Create material
@@ -1326,7 +1335,7 @@ bool MapBlockMesh::animate(bool faraway, float time, int crack, u32 daynight_rat
        }
 
        // Day-night transition
-       if(daynight_ratio != m_last_daynight_ratio)
+       if(!m_enable_shaders && (daynight_ratio != m_last_daynight_ratio))
        {
                for(std::map<u32, std::map<u32, std::pair<u8, u8> > >::iterator
                                i = m_daynight_diffs.begin();