Minor changes to cloud lighting to help blending

CaffeineMC · Jul 20, 2023 · a2da746 · a2da746
1 parent fa594b4
commit a2da746
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/resources/assets/minecraft/shaders/core/clouds.fsh b/src/main/resources/assets/minecraft/shaders/core/clouds.fsh
@@ -4,6 +4,7 @@
 
 uniform mat4 ProjMat;
 uniform vec4 ColorModulator;
+uniform vec4 FogColor;
 uniform float FogStart;
 uniform float FogEnd;
 
@@ -22,7 +23,7 @@ void main() {
 
     float width = FogEnd - FogStart;
     float newWidth = width * 4.0;
-    float fade = linear_fog_fade(vertexDistance, FogStart, FogStart + newWidth);
-    fragColor = vec4(color.rgb, color.a * fade);
+    float fade = linear_fog_fade(vertexDistance, FogStart, FogStart + newWidth) * FogColor.a;
+    fragColor = vec4(mix(FogColor.rgb, color.rgb, 0.7), clamp(color.a * fade, 0.0, 1.0));
 }
 
diff --git a/src/main/resources/assets/minecraft/shaders/core/clouds.json b/src/main/resources/assets/minecraft/shaders/core/clouds.json
@@ -16,7 +16,8 @@
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] },
-        { "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] }
+        { "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] },
+        { "name": "FogColor", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }
     ]
 }