Shaders: Harmonize Irrlicht and shader fog calculations

lhofhansl · paramat · commit 779d2c5f64e3 · 2016-10-24T07:41:00.000+01:00
diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -197,14 +197,14 @@ void main(void)
 #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT
 	float alpha = gl_Color.a;
 	if (fogDistance != 0.0) {
-		float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
-		alpha = mix(alpha, 0.0, d);
+		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
+		alpha = mix(0.0, alpha, d);
 	}
 	col = vec4(col.rgb, alpha);
 #else
 	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);
 	}
 	col = vec4(col.rgb, base.a);
 #endif
diff --git a/client/shaders/water_surface_shader/opengl_fragment.glsl b/client/shaders/water_surface_shader/opengl_fragment.glsl
@@ -153,14 +153,14 @@ vec4 base = texture2D(baseTexture, uv).rgba;
 #if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE
 	float alpha = gl_Color.a;
 	if (fogDistance != 0.0) {
-		float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
-		alpha = mix(alpha, 0.0, d);
+		float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
+		alpha = mix(0.0, alpha, d);
 	}
 	col = vec4(col.rgb, alpha);
 #else
 	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);
 	}
 	col = vec4(col.rgb, base.a);
 #endif
diff --git 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);
 }

Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,8 @@ void main(void)`
`107`	`107`	`vec4 col = vec4(color.rgb, base.a);`
`108`	`108`	`col *= gl_Color;`
`109`	`109`	`if (fogDistance != 0.0) {`
`110`		`- float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));`
`111`		`- col = mix(col, skyBgColor, d);`
	`110`	`+ float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);`
	`111`	`+ col = mix(skyBgColor, col, d);`
`112`	`112`	`}`
`113`	`113`	`gl_FragColor = vec4(col.rgb, base.a);`
`114`	`114`	`}`