BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Use range-based fog instead of z-plane based.

Browse Source
This commit is contained in:
Lars Hofhansl 2016-10-12 13:38:53 -07:00 committed by sfan5
parent c9e7a27eeb
commit 0ad40fd484
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,13 +197,13 @@ 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(vPosition.z / fogDistance * 1.5 - 0.6, 1.0)); float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
alpha = mix(alpha, 0.0, d); alpha = mix(alpha, 0.0, 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(vPosition.z / fogDistance * 1.5 - 0.6, 1.0)); float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
col = mix(col, skyBgColor, d); col = mix(col, skyBgColor, d);
} }
col = vec4(col.rgb, base.a); col = vec4(col.rgb, base.a);

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

@ -153,13 +153,13 @@ 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(vPosition.z / fogDistance * 1.5 - 0.6, 1.0)); float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
alpha = mix(alpha, 0.0, d); alpha = mix(alpha, 0.0, 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(vPosition.z / fogDistance * 1.5 - 0.6, 1.0)); float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
col = mix(col, skyBgColor, d); col = mix(col, skyBgColor, d);
} }
col = vec4(col.rgb, base.a); col = vec4(col.rgb, base.a);

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

@ -107,7 +107,7 @@ 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(vPosition.z / fogDistance * 1.5 - 0.6, 1.0)); float d = max(0.0, min(length(eyeVec) / fogDistance * 1.5 - 0.6, 1.0));
col = mix(col, skyBgColor, d); col = mix(col, skyBgColor, d);
} }
gl_FragColor = vec4(col.rgb, base.a); gl_FragColor = vec4(col.rgb, base.a);

2
src/game.cpp
View File

@ -4168,7 +4168,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats,
runData->fog_range * 1.0, runData->fog_range * 1.0,
0.01, 0.01,
false, // pixel fog false, // pixel fog
false // range fog true // range fog
); );
} else { } else {
driver->setFog( driver->setFog(