Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2024-12-22 17:47:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix clouds interaction with cave fog

Browse Source
This commit is contained in:
Xonk 2024-06-28 15:22:48 -04:00
parent 2f330b1bf4
commit f3f75bcf38
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shaders/dimensions/composite2.fsh
View File

@ -379,6 +379,9 @@ void main() {
#endif #endif
vec3 viewPos0 = toScreenSpace_DH(tc/RENDER_SCALE, z0, DH_z0); vec3 viewPos0 = toScreenSpace_DH(tc/RENDER_SCALE, z0, DH_z0);
vec3 playerPos_normalized = normalize(mat3(gbufferModelViewInverse) * viewPos0 + gbufferModelViewInverse[3].xyz);
float dirtAmount = Dirt_Amount + 0.01; float dirtAmount = Dirt_Amount + 0.01;
vec3 waterEpsilon = vec3(Water_Absorb_R, Water_Absorb_G, Water_Absorb_B); vec3 waterEpsilon = vec3(Water_Absorb_R, Water_Absorb_G, Water_Absorb_B);
@ -395,6 +398,12 @@ void main() {
#if defined OVERWORLD_SHADER && defined CLOUDS_INTERSECT_TERRAIN #if defined OVERWORLD_SHADER && defined CLOUDS_INTERSECT_TERRAIN
vec4 VolumetricClouds = renderClouds(viewPos0, vec2(noise_1,noise_2), directLightColor, indirectLightColor, cloudDepth); vec4 VolumetricClouds = renderClouds(viewPos0, vec2(noise_1,noise_2), directLightColor, indirectLightColor, cloudDepth);
#ifdef CAVE_FOG
float skyhole = (1.0-pow(clamp(1.0-pow(max(playerPos_normalized.y - 0.6,0.0)*5.0,2.0),0.0,1.0),2)) * caveDetection;
VolumetricClouds.rgb *=skyhole;
VolumetricClouds.a = mix(1.0,VolumetricClouds.a, skyhole);
#endif
#endif #endif
#ifdef OVERWORLD_SHADER #ifdef OVERWORLD_SHADER
@ -406,6 +415,7 @@ void main() {
#endif #endif
#if defined OVERWORLD_SHADER && defined CLOUDS_INTERSECT_TERRAIN #if defined OVERWORLD_SHADER && defined CLOUDS_INTERSECT_TERRAIN
VolumetricFog = vec4(VolumetricClouds.rgb * VolumetricFog.a + VolumetricFog.rgb, VolumetricFog.a); VolumetricFog = vec4(VolumetricClouds.rgb * VolumetricFog.a + VolumetricFog.rgb, VolumetricFog.a);
#endif #endif

2
shaders/lib/settings.glsl
View File

@ -1,4 +1,4 @@
#define SHADER_VERSION_LABEL 470 // [470] #define SHADER_VERSION_LABEL 471 // [471]
#define saturate(x) clamp(x,0.0,1.0) #define saturate(x) clamp(x,0.0,1.0)