oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-26 18:21:04 +00:00
Code Wiki Activity

Fix broken coloring of wielditems (#9969)

Browse source 
Fixes a regression that appeared in 5.3.0-dev.
This commit is contained in:
Danila Shutov 2020-06-09 22:38:09 +03:00 • committed by GitHub
parent 7148834440
commit fe3e69eb40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/shaders/object_shader/opengl_fragment.glsl
View file

@ -145,8 +145,10 @@ void main(void)
vec4 col = vec4(color.rgb, base.a);
col.rgb *= gl_Color.rgb;
col.rgb *= emissiveColor.rgb * vIDiff;
#ifdef ENABLE_TONE_MAPPING
col = applyToneMapping(col);
#endif

7
client/shaders/object_shader/opengl_vertex.glsl
View file

@ -38,7 +38,12 @@ void main(void)
lightVec = sunPosition - worldPosition;
eyeVec = -(gl_ModelViewMatrix * gl_Vertex).xyz;
vIDiff = directional_ambient(normalize(gl_Normal));
// This is intentional comparison with zero without any margin.
// If normal is not equal to zero exactly, then we assume it's a valid, just not normalized vector
vIDiff = length(gl_Normal) == 0.0
? 1.0
: directional_ambient(normalize(gl_Normal));
gl_FrontColor = gl_BackColor = gl_Color;
}