Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Use range-based fog instead of z-plane based.
- Loading branch information
|
@@ -197,13 +197,13 @@ 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(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); |
|
|
} |
|
|
col = vec4(col.rgb, alpha); |
|
|
#else |
|
|
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 = vec4(col.rgb, base.a); |
|
|
|
@@ -153,13 +153,13 @@ 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(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); |
|
|
} |
|
|
col = vec4(col.rgb, alpha); |
|
|
#else |
|
|
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 = vec4(col.rgb, base.a); |
|
|
|
@@ -107,7 +107,7 @@ void main(void) |
|
|
vec4 col = vec4(color.rgb, base.a); |
|
|
col *= gl_Color; |
|
|
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); |
|
|
} |
|
|
gl_FragColor = vec4(col.rgb, base.a); |
|
|
|
@@ -4168,7 +4168,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, |
|
|
runData->fog_range * 1.0, |
|
|
0.01, |
|
|
false, // pixel fog |
|
|
false // range fog |
|
|
true // range fog |
|
|
); |
|
|
} else { |
|
|
driver->setFog( |
|
|