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

Shaders: Harmonize Irrlicht and shader fog calculations

Browse Source
This commit is contained in:
Lars Hofhansl 2016-10-20 22:21:49 -07:00 committed by paramat
parent 74eb7f50c9
commit 779d2c5f64
3 changed files with 10 additions and 10 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

@ -197,14 +197,14 @@ void main(void)
#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) {
float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0)); float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
alpha = mix(alpha, 0.0, d); alpha = mix(0.0, alpha, d);
} }
col = vec4(col.rgb, alpha); col = vec4(col.rgb, alpha);
#else #else
if (fogDistance != 0.0) { if (fogDistance != 0.0) {
float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0)); float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
col = mix(col, skyBgColor, d); col = mix(skyBgColor, col, d);
} }
col = vec4(col.rgb, base.a); col = vec4(col.rgb, base.a);
#endif #endif

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

@ -153,14 +153,14 @@ vec4 base = texture2D(baseTexture, uv).rgba;
#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) {
float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0)); float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
alpha = mix(alpha, 0.0, d); alpha = mix(0.0, alpha, d);
} }
col = vec4(col.rgb, alpha); col = vec4(col.rgb, alpha);
#else #else
if (fogDistance != 0.0) { if (fogDistance != 0.0) {
float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0)); float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
col = mix(col, skyBgColor, d); col = mix(skyBgColor, col, d);
} }
col = vec4(col.rgb, base.a); col = vec4(col.rgb, base.a);
#endif #endif

4
client/shaders/wielded_shader/opengl_fragment.glsl
View File

@ -107,8 +107,8 @@ void main(void)
vec4 col = vec4(color.rgb, base.a); vec4 col = vec4(color.rgb, base.a);
col *= gl_Color; col *= gl_Color;
if (fogDistance != 0.0) { if (fogDistance != 0.0) {
float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0)); float d = clamp((fogDistance - length(eyeVec)) / (fogDistance * 0.6), 0.0, 1.0);
col = mix(col, skyBgColor, d); col = mix(skyBgColor, col, d);
} }
gl_FragColor = vec4(col.rgb, base.a); gl_FragColor = vec4(col.rgb, base.a);
} }