minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Shaders: Apply tone mapping before fog calculation.

This commit is contained in:
Lars Hofhansl 2016-10-24 08:23:13 -07:00
parent 779d2c5f64
commit 98dad584ae
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/shaders/nodes_shader/opengl_fragment.glsl
View File

@ -194,6 +194,10 @@ void main(void)
vec4 col = vec4(color.rgb * gl_Color.rgb, 1.0); vec4 col = vec4(color.rgb * gl_Color.rgb, 1.0);
#ifdef ENABLE_TONE_MAPPING
col = applyToneMapping(col);
#endif
#if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT
float alpha = gl_Color.a; float alpha = gl_Color.a;
if (fogDistance != 0.0) { if (fogDistance != 0.0) {
@ -209,9 +213,5 @@ void main(void)
col = vec4(col.rgb, base.a); col = vec4(col.rgb, base.a);
#endif #endif
#ifdef ENABLE_TONE_MAPPING
gl_FragColor = applyToneMapping(col);
#else
gl_FragColor = col; gl_FragColor = col;
#endif
} }

8
client/shaders/water_surface_shader/opengl_fragment.glsl
View File

@ -150,6 +150,10 @@ vec4 base = texture2D(baseTexture, uv).rgba;
vec4 col = vec4(color.rgb * gl_Color.rgb, 1.0); vec4 col = vec4(color.rgb * gl_Color.rgb, 1.0);
#ifdef ENABLE_TONE_MAPPING
col = applyToneMapping(col);
#endif
#if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE
float alpha = gl_Color.a; float alpha = gl_Color.a;
if (fogDistance != 0.0) { if (fogDistance != 0.0) {
@ -165,9 +169,5 @@ vec4 base = texture2D(baseTexture, uv).rgba;
col = vec4(col.rgb, base.a); col = vec4(col.rgb, base.a);
#endif #endif
#ifdef ENABLE_TONE_MAPPING
gl_FragColor = applyToneMapping(col);
#else
gl_FragColor = col; gl_FragColor = col;
#endif
} }