aboutsummaryrefslogtreecommitdiff
path: root/client/shaders/wielded_shader
diff options
context:
space:
mode:
authorLars Hofhansl <larsh@apache.org>2016-10-20 22:21:49 -0700
committerparamat <mat.gregory@virginmedia.com>2016-10-24 07:41:00 +0100
commit779d2c5f64e321cc126b3e3abed9e37fd30edb1b (patch)
tree9c76ce1d6d398c0857503798eae62ec5841d1bd4 /client/shaders/wielded_shader
parent74eb7f50c9965e77794c0c5caebc1d067cd49629 (diff)
downloadminetest-779d2c5f64e321cc126b3e3abed9e37fd30edb1b.tar.gz
minetest-779d2c5f64e321cc126b3e3abed9e37fd30edb1b.tar.bz2
minetest-779d2c5f64e321cc126b3e3abed9e37fd30edb1b.zip
Shaders: Harmonize Irrlicht and shader fog calculations
Diffstat (limited to 'client/shaders/wielded_shader')
-rw-r--r--client/shaders/wielded_shader/opengl_fragment.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/shaders/wielded_shader/opengl_fragment.glsl b/client/shaders/wielded_shader/opengl_fragment.glsl
index afb8cc32d..bd9741441 100644
--- a/client/shaders/wielded_shader/opengl_fragment.glsl
+++ b/client/shaders/wielded_shader/opengl_fragment.glsl
@@ -107,8 +107,8 @@ void main(void)
vec4 col = vec4(color.rgb, base.a);
col *= gl_Color;
if (fogDistance != 0.0) {
- float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
- col = mix(col, skyBgColor, d);
+ float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
+ col = mix(skyBgColor, col, d);
}
gl_FragColor = vec4(col.rgb, base.a);
}