Fixed the particles light calculation

minetest · Apr 30, 2024 · 32ac22c · 32ac22c
1 parent 5801fa7
commit 32ac22c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -8,7 +8,6 @@ uniform float fogShadingParameter;
 // The cameraOffset is the current center of the visible world.
 uniform highp vec3 cameraOffset;
 uniform float animationTimer;
-
 #ifdef ENABLE_DYNAMIC_SHADOWS
 	// shadow texture
 	uniform sampler2D ShadowMapSampler;
@@ -376,7 +375,6 @@ void main(void)
 #endif
 
 	color = base.rgb;
-
 	vec4 col = vec4(color.rgb * varColor.rgb, 1.0);
 
 #ifdef ENABLE_DYNAMIC_SHADOWS

diff --git a/client/shaders/object_shader/opengl_fragment.glsl b/client/shaders/object_shader/opengl_fragment.glsl
@@ -8,7 +8,6 @@ uniform float fogShadingParameter;
 // The cameraOffset is the current center of the visible world.
 uniform highp vec3 cameraOffset;
 uniform float animationTimer;
-
 #ifdef ENABLE_DYNAMIC_SHADOWS
 	// shadow texture
 	uniform sampler2D ShadowMapSampler;
@@ -379,7 +378,6 @@ void main(void)
 #endif
 
 	color = base.rgb;
-
 	vec4 col = vec4(color.rgb * varColor.rgb, 1.0);
 	col.rgb *= vIDiff;
 

diff --git a/src/client/particles.cpp b/src/client/particles.cpp
@@ -186,7 +186,7 @@ video::SColor Particle::updateLight(ClientEnvironment *env)
 	else
 		light = blend_light(env->getDayNightRatio(), LIGHT_SUN, 0);
 
-	light += m_p.glow;
+	light = decode_light(light + m_p.glow);
 
 	video::SColor light_color{0xFFFFFFFF};