moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-11-17 14:55:13 -05:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
lhofhansl 2016-10-26 07:24:45 -07:00 committed by est31
parent 6eb6e75fff
commit 198ed60cab
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,20 +198,11 @@ void main(void)
col = applyToneMapping(col); col = applyToneMapping(col);
#endif #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) { if (fogDistance != 0.0) {
float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0); float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
col = mix(skyBgColor, col, d); col = mix(skyBgColor, col, d);
} }
col = vec4(col.rgb, base.a); col = vec4(col.rgb, base.a);
#endif
gl_FragColor = col; gl_FragColor = col;
} }

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

@ -154,20 +154,11 @@ vec4 base = texture2D(baseTexture, uv).rgba;
col = applyToneMapping(col); col = applyToneMapping(col);
#endif #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) { if (fogDistance != 0.0) {
float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0); float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
col = mix(skyBgColor, col, d); col = mix(skyBgColor, col, d);
} }
col = vec4(col.rgb, base.a); col = vec4(col.rgb, base.a);
#endif
gl_FragColor = col; gl_FragColor = col;
} }