Shaders: Remove special handling for liquids. (#4670)

diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl
index 09c40b652c194f3142e8415bb55a812fc3bb7f4f..4d9ce1c12dfbe80fbc1388d815d732db8f97d008 100644 (file)
--- a/client/shaders/nodes_shader/opengl_fragment.glsl
+++ b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -198,20 +198,11 @@ void main(void)
        col = applyToneMapping(col);
 #endif
 
-#if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT
-       float alpha = gl_Color.a;
-       if (fogDistance != 0.0) {
-               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 = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
                col = mix(skyBgColor, col, d);
        }
        col = vec4(col.rgb, base.a);
-#endif
 
        gl_FragColor = col;
 }

diff --git a/client/shaders/water_surface_shader/opengl_fragment.glsl b/client/shaders/water_surface_shader/opengl_fragment.glsl
index d910220e958ba01d02c529d0c1b72f6708fad003..b4c0cc4f819e9daeea7064e8a2795ab32f0b896b 100644 (file)
--- a/client/shaders/water_surface_shader/opengl_fragment.glsl
+++ b/client/shaders/water_surface_shader/opengl_fragment.glsl
@@ -154,20 +154,11 @@ vec4 base = texture2D(baseTexture, uv).rgba;
        col = applyToneMapping(col);
 #endif
 
-#if MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE
-       float alpha = gl_Color.a;
-       if (fogDistance != 0.0) {
-               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 = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
                col = mix(skyBgColor, col, d);
        }
        col = vec4(col.rgb, base.a);
-#endif
 
        gl_FragColor = col;
 }