fix upstream/leo60228#4

[Fog multiplier calculation was hardcoded to 1; 1 works for water, but not lava(2) or powdered snow(3)]
Iristallite · Feb 6, 2023 · 56afa8f · 56afa8f
1 parent 890a3b9
commit 56afa8f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/shaders/gbuffers_basic.fsh b/shaders/gbuffers_basic.fsh
@@ -13,7 +13,7 @@ void main()
     vec4 col = color;
 
     //Calculate fog intensity in or out of water.
-    float fog = (isEyeInWater>0) ? 1.-exp(-gl_FogFragCoord * gl_Fog.density):
+    float fog = (isEyeInWater>0) ? isEyeInWater.-exp(-gl_FogFragCoord * gl_Fog.density):
     clamp((gl_FogFragCoord-gl_Fog.start) * gl_Fog.scale, 0., 1.);
 
     //Apply the fog.

diff --git a/shaders/gbuffers_clouds.fsh b/shaders/gbuffers_clouds.fsh
@@ -19,7 +19,7 @@ void main()
     vec4 col = color * texture2D(texture,coord0);
 
     //Calculate fog intensity in or out of water.
-    float fog = (isEyeInWater>0) ? 1.-exp(-gl_FogFragCoord * gl_Fog.density):
+    float fog = (isEyeInWater>0) ? isEyeInWater.-exp(-gl_FogFragCoord * gl_Fog.density):
     clamp((gl_FogFragCoord-gl_Fog.start) * gl_Fog.scale, 0., 1.);
 
     //Apply the fog.

diff --git a/shaders/gbuffers_damagedblock.fsh b/shaders/gbuffers_damagedblock.fsh
@@ -20,7 +20,7 @@ void main()
     vec4 col = texture2D(texture,coord0);
 
     //Calculate fog intensity in or out of water.
-    float fog = (isEyeInWater>0) ? 1.-exp(-gl_FogFragCoord * gl_Fog.density):
+    float fog = (isEyeInWater>0) ? isEyeInWater.-exp(-gl_FogFragCoord * gl_Fog.density):
     clamp((gl_FogFragCoord-gl_Fog.start) * gl_Fog.scale, 0., 1.);
 
     //Apply the fog.

diff --git a/shaders/gbuffers_textured.fsh b/shaders/gbuffers_textured.fsh
@@ -27,7 +27,7 @@ void main()
     col.rgb = mix(col.rgb,entityColor.rgb,entityColor.a);
 
     //Calculate fog intensity in or out of water.
-    float fog = (isEyeInWater>0) ? 1.-exp(-gl_FogFragCoord * gl_Fog.density):
+    float fog = (isEyeInWater>0) ? isEyeInWater.-exp(-gl_FogFragCoord * gl_Fog.density):
     clamp((gl_FogFragCoord-gl_Fog.start) * gl_Fog.scale, 0., 1.);
 
     //Apply the fog.