COLORED_LIGHT_FOG_RAIN

Author: woopSmile

shaders/program/composite1.glsl

@@ -1,4 +1,4 @@
-#include "/lib/shaderSettings/doomAndGloomFog.glsl"
+#include "/lib/shaderSettings/doomAndGloomFog.glsl"
 /////////////////////////////////////
 // Complementary Shaders by EminGT //
 /////////////////////////////////////
@@ -17,8 +17,8 @@
     #undef NETHER_STORM
 #endif
 #define COLORED_LIGHT_FOG_RAIN_I 0 //[0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100 105 110 115 120 125 130 135 140 145 150 155 160 165 170 175 180 185 190 195 200]
-#ifdef COLORED_LIGHT_FOG_RAIN_I
-#endif
+//#ifdef COLORED_LIGHT_FOG_RAIN_I
+//#endif
 
 //////////Fragment Shader//////////Fragment Shader//////////Fragment Shader//////////
 #ifdef FRAGMENT_SHADER
@@ -59,11 +59,11 @@ float GetLinearDepth(float depth) {
     return (2.0 * near) / (far + near - depth * (far - near));
 }
 
-//Includes//
-#if defined MOD_SCORCHFUL && (VOLUMETRIC_SCORCHFUL_SANDSTORM >= 1)
-    #include "/lib/atmospherics/scorchfulSandstormFog.glsl"
-#endif
-
+//Includes//
+#if defined MOD_SCORCHFUL && (VOLUMETRIC_SCORCHFUL_SANDSTORM >= 1)
+    #include "/lib/atmospherics/scorchfulSandstormFog.glsl"
+#endif
+
 
 #include "/lib/atmospherics/fog/waterFog.glsl"
 #include "/lib/atmospherics/fog/caveFactor.glsl"
@@ -279,11 +279,11 @@ void main() {
     #ifdef COLORED_LIGHT_FOG
         vec3 lightFog = GetColoredLightFog(nPlayerPos, translucentMult, lViewPos, lViewPos1, dither, vlFactorM);
         float lightFogMult = COLORED_LIGHT_FOG_I;
-        lightFogLength += length(lightFog);
-        #if DOOM_AND_GLOOM_FOG == 1
-            lightFogMult *= DG_ACT_FOG_INTENSITY;
-        #elif defined MOD_DOOM_AND_GLOOM && (DOOM_AND_GLOOM_FOG == 0)
-            lightFogMult *= mix(1, DG_ACT_FOG_INTENSITY, doomAndGloomFog);
+        lightFogLength += length(lightFog);
+        #if DOOM_AND_GLOOM_FOG == 1
+            lightFogMult *= DG_ACT_FOG_INTENSITY;
+        #elif defined MOD_DOOM_AND_GLOOM && (DOOM_AND_GLOOM_FOG == 0)
+            lightFogMult *= mix(1, DG_ACT_FOG_INTENSITY, doomAndGloomFog);
         #endif
         //if (heldItemId == 40000 && heldItemId2 != 40000) lightFogMult = 0.0; // Hold spider eye to disable light fog
 
@@ -295,20 +295,20 @@ void main() {
         #endif
     #endif
 
-    #if defined MOD_SCORCHFUL && (VOLUMETRIC_SCORCHFUL_SANDSTORM >= 1)
-        vec4 effect = GetVolumetricSandstorm(color, translucentMult, nPlayerPos, playerPos, lViewPos, lViewPos1, dither) * rainFactor * hasSandstorm;
-        
-        #if defined ATM_COLOR_MULTS || defined SPOOKY
-            effect.rgb *= GetAtmColorMult();
-        #endif
-        #ifdef MOON_PHASE_INF_ATMOSPHERE
-            effect.rgb *= moonPhaseInfluence;
-        #endif
-        
-        color = mix(color, effect.rgb, effect.a);
-    #endif
-
-
+    #if defined MOD_SCORCHFUL && (VOLUMETRIC_SCORCHFUL_SANDSTORM >= 1)
+        vec4 effect = GetVolumetricSandstorm(color, translucentMult, nPlayerPos, playerPos, lViewPos, lViewPos1, dither) * rainFactor * hasSandstorm;
+        
+        #if defined ATM_COLOR_MULTS || defined SPOOKY
+            effect.rgb *= GetAtmColorMult();
+        #endif
+        #ifdef MOON_PHASE_INF_ATMOSPHERE
+            effect.rgb *= moonPhaseInfluence;
+        #endif
+        
+        color = mix(color, effect.rgb, effect.a);
+    #endif
+
+
     if (isEyeInWater == 1) {
         if (z0 == 1.0) color.rgb = waterFogColor;