From 8c5a2360c4b07b3d8149b846b572ee87324b6090 Mon Sep 17 00:00:00 2001
From: Xonk <XonkDev@gmail.com>
Date: Sun, 11 Jun 2023 18:32:37 -0400
Subject: [PATCH] fix rain fog brightness

---
 shaders/lib/volumetricFog.glsl        | 7 ++++---
 shaders/shaders.properties            | 2 +-
 shaders/world-1/gbuffers_basic.vsh    | 1 +
 shaders/world-1/gbuffers_block.fsh    | 1 +
 shaders/world-1/gbuffers_entities.vsh | 1 +
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/shaders/lib/volumetricFog.glsl b/shaders/lib/volumetricFog.glsl
index db1a811..f22e4ca 100644
--- a/shaders/lib/volumetricFog.glsl
+++ b/shaders/lib/volumetricFog.glsl
@@ -36,7 +36,7 @@ float cloudVol(in vec3 pos){
 	
 	TimeOfDayFog(UniformFog, CloudyFog);
 
-	return CloudyFog + UniformFog;
+	return CloudyFog + UniformFog + RainFog;
 }
 
 vec4 getVolumetricRays(
@@ -254,6 +254,7 @@ vec4 InsideACloudFog(
 
 
 			float cloudhsadow = 1;
+			
 			#ifdef VL_CLOUDS_SHADOWS
 				cloudhsadow = sh * GetCloudShadow_VLFOG(progressW);
 			#endif
@@ -274,8 +275,8 @@ vec4 InsideACloudFog(
 			vec3 AtmosphericFog = Fog_SkyCol * (rL+m)  ;
 
 			// extra fog effects
-			vec3 rainRays =   (sunColor*cloudhsadow) * (rayL*phaseg(SdotV,0.5)) * clamp(pow(WsunVec.y,5)*2,0.0,1) * rainStrength * RainFog_amount; 
-			vec3 CaveRays = (sunColor*cloudhsadow)  * phaseg(SdotV,0.7) * 0.001 * (1.0 - max(eyeBrightnessSmooth.y,0)/240.);
+			vec3 rainRays =   ((Fog_SunCol/5)*cloudhsadow) * (rayL*phaseg(SdotV,0.5)) * clamp(pow(WsunVec.y,5)*2,0.0,1.0) * rainStrength * RainFog_amount; 
+			vec3 CaveRays = (Fog_SunCol*cloudhsadow)  * phaseg(SdotV,0.7) * 0.001 * (1.0 - max(eyeBrightnessSmooth.y,0)/240.);
  
 			vec3 vL0 = (DirectLight + AmbientLight + AtmosphericFog + rainRays ) * max(eyeBrightnessSmooth.y,0)/240. + CaveRays ;
 
diff --git a/shaders/shaders.properties b/shaders/shaders.properties
index 813c17d..da028eb 100644
--- a/shaders/shaders.properties
+++ b/shaders/shaders.properties
@@ -225,7 +225,7 @@ uniform.float.Alto_Cov = smooth(2, if( \
 
 uniform.float.Alto_Den = smooth(3, if( \
     moonPhase == 0, 0.1, \
-    moonPhase == 1, 0.35, \
+    moonPhase == 1, 0.25, \
     moonPhase == 2, 0.0, \
     moonPhase == 3, 0.0, \
     moonPhase == 4, 0.0, \
diff --git a/shaders/world-1/gbuffers_basic.vsh b/shaders/world-1/gbuffers_basic.vsh
index 2577f65..b2c0524 100644
--- a/shaders/world-1/gbuffers_basic.vsh
+++ b/shaders/world-1/gbuffers_basic.vsh
@@ -4,4 +4,5 @@
 // #define LINE
 #define BLOCKENTITIES
 #define WORLD
+
 #include "/programs/all_solid.vsh"
\ No newline at end of file
diff --git a/shaders/world-1/gbuffers_block.fsh b/shaders/world-1/gbuffers_block.fsh
index 3397eab..3f53c5f 100644
--- a/shaders/world-1/gbuffers_block.fsh
+++ b/shaders/world-1/gbuffers_block.fsh
@@ -2,4 +2,5 @@
 
 #define WORLD
 #define BLOCKENTITIES
+
 #include "/programs/all_solid.fsh"
\ No newline at end of file
diff --git a/shaders/world-1/gbuffers_entities.vsh b/shaders/world-1/gbuffers_entities.vsh
index 460f566..866d895 100644
--- a/shaders/world-1/gbuffers_entities.vsh
+++ b/shaders/world-1/gbuffers_entities.vsh
@@ -3,4 +3,5 @@
 
 // #define WORLD
 #define ENTITIES
+
 #include "/programs/all_solid.vsh"
\ No newline at end of file