-Weather fog effects no longer affect underground

Eldeston · Jun 22, 2021 · 3cb42b7 · 3cb42b7
1 parent ea2fa99
commit 3cb42b7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/shaders/lib/atmospherics/fog.glsl b/shaders/lib/atmospherics/fog.glsl
@@ -12,7 +12,7 @@ vec3 getFog(vec3 eyePlayerPos, vec3 color, vec3 fogCol, float worldPosY, float s
     float waterVoid = smootherstep(nEyePlayerPos.y + (eyeBrightFact - 0.6));
 
     float eyePlayerPosLength = length(eyePlayerPos);
-    float rainMult = 1.0 + rainStrength;
+    float rainMult = 1.0 + rainStrength * eyeBrightFact;
 
     #ifdef NETHER
         float c = 0.12; float b = 0.08; float o = 0.6;

diff --git a/shaders/lib/structs.glsl b/shaders/lib/structs.glsl
@@ -1,11 +1,11 @@
 // Material PBR struct
 struct matPBR{
-    // Light map
-    vec2 light_m;
     // Albedo texture
     vec3 albedo_t;
     // Normal map
     vec3 normal_m;
+    // Light map
+    vec2 light_m;
     // Subsurface scattering
     float ss_m;
     // Metalic map

diff --git a/shaders/lib/varAssembler.glsl b/shaders/lib/varAssembler.glsl
@@ -7,9 +7,9 @@ void getMaterial(inout matPBR material, vec2 st){
 	vec3 matRaw2 = texture2D(colortex4, st).xyz;
 
     // Assign materials
-	material.light_m = matRaw0.xy;
 	material.albedo_t = texture2D(gcolor, st).rgb;
 	material.normal_m = mat3(gbufferModelViewInverse) * (texture2D(colortex1, st).rgb * 2.0 - 1.0);
+	material.light_m = matRaw0.xy;
 
 	material.ss_m = matRaw0.z; material.metallic_m = matRaw1.x;
 	material.emissive_m = matRaw1.y; material.roughness_m = matRaw1.z;