From 114bd31d0946aeeca7ace190590b173c25bbad2b Mon Sep 17 00:00:00 2001 From: Xonk Date: Thu, 27 Jun 2024 15:53:27 -0400 Subject: [PATCH] enabled "clouds intersect terrain" by default --- shaders/dimensions/composite1.fsh | 2 +- shaders/dimensions/composite2.fsh | 2 +- shaders/dimensions/composite3.fsh | 2 +- shaders/dimensions/deferred2.fsh | 2 +- shaders/dimensions/fogBehindTranslucent_pass.fsh | 2 +- shaders/lib/settings.glsl | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/shaders/dimensions/composite1.fsh b/shaders/dimensions/composite1.fsh index 318ba4b..4a79cc2 100644 --- a/shaders/dimensions/composite1.fsh +++ b/shaders/dimensions/composite1.fsh @@ -171,7 +171,7 @@ vec3 toScreenSpace(vec3 p) { #define CLOUDSHADOWSONLY #include "/lib/volumetricClouds.glsl" - // #define CLOUDS_INTERSECT_TERRAIN + #define CLOUDS_INTERSECT_TERRAIN #endif diff --git a/shaders/dimensions/composite2.fsh b/shaders/dimensions/composite2.fsh index 20a5f23..689702a 100644 --- a/shaders/dimensions/composite2.fsh +++ b/shaders/dimensions/composite2.fsh @@ -140,7 +140,7 @@ float linearizeDepthFast(const in float depth, const in float near, const in flo // uniform int dhRenderDistance; #define TIMEOFDAYFOG #include "/lib/lightning_stuff.glsl" - // #define CLOUDS_INTERSECT_TERRAIN + #define CLOUDS_INTERSECT_TERRAIN #include "/lib/volumetricClouds.glsl" #include "/lib/overworld_fog.glsl" #endif diff --git a/shaders/dimensions/composite3.fsh b/shaders/dimensions/composite3.fsh index 53af1dc..95e3617 100644 --- a/shaders/dimensions/composite3.fsh +++ b/shaders/dimensions/composite3.fsh @@ -72,7 +72,7 @@ uniform float caveDetection; #include "/lib/sky_gradient.glsl" #include "/lib/lightning_stuff.glsl" #include "/lib/climate_settings.glsl" - //#define CLOUDS_INTERSECT_TERRAIN + #define CLOUDS_INTERSECT_TERRAIN // #define CLOUDSHADOWSONLY // #include "/lib/volumetricClouds.glsl" #endif diff --git a/shaders/dimensions/deferred2.fsh b/shaders/dimensions/deferred2.fsh index 526127d..d4e3741 100644 --- a/shaders/dimensions/deferred2.fsh +++ b/shaders/dimensions/deferred2.fsh @@ -104,7 +104,7 @@ uniform int dhRenderDistance; #include "/lib/sky_gradient.glsl" #include "/lib/res_params.glsl" -// #define CLOUDS_INTERSECT_TERRAIN +#define CLOUDS_INTERSECT_TERRAIN uniform float eyeAltitude; #include "/lib/volumetricClouds.glsl" diff --git a/shaders/dimensions/fogBehindTranslucent_pass.fsh b/shaders/dimensions/fogBehindTranslucent_pass.fsh index 6f1ffb1..3d0c9d7 100644 --- a/shaders/dimensions/fogBehindTranslucent_pass.fsh +++ b/shaders/dimensions/fogBehindTranslucent_pass.fsh @@ -92,7 +92,7 @@ float linearizeDepthFast(const in float depth, const in float near, const in flo #define TIMEOFDAYFOG #include "/lib/lightning_stuff.glsl" - // #define CLOUDS_INTERSECT_TERRAIN + #define CLOUDS_INTERSECT_TERRAIN // #define CLOUDSHADOWSONLY #include "/lib/volumetricClouds.glsl" #include "/lib/overworld_fog.glsl" diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index 1972496..15a025d 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -1,4 +1,4 @@ -#define SHADER_VERSION_LABEL 468 // [468] +#define SHADER_VERSION_LABEL 469 // [469] #define saturate(x) clamp(x,0.0,1.0) @@ -691,7 +691,6 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631) // #define OLD_BLOOM // #define BLOOMY_PARTICLES // #define ORIGINAL_CHOCAPIC_SKY -// #define CLOUDS_INFRONT_OF_WORLD // #define LARGE_WAVE_DISPLACEMENT #define SELECT_BOX