From 9a6ffa360c7a168c1e3fd838985853e1140cd7ce Mon Sep 17 00:00:00 2001 From: Xonk Date: Wed, 26 Jun 2024 16:16:20 -0400 Subject: [PATCH] fix minimum light with HQ ssgi is enabled. fix commit number distplay --- shaders/dimensions/composite1.fsh | 2 +- shaders/lib/indirect_lighting_effects.glsl | 7 +++---- shaders/lib/settings.glsl | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/shaders/dimensions/composite1.fsh b/shaders/dimensions/composite1.fsh index f285966..d09e6b3 100644 --- a/shaders/dimensions/composite1.fsh +++ b/shaders/dimensions/composite1.fsh @@ -1179,7 +1179,7 @@ void main() { // RTAO and/or SSGI #if indirect_effect == 3 || indirect_effect == 4 - if(!hand) Indirect_lighting = ApplySSRT(Indirect_lighting, blockLightColor, viewPos, normal, vec3(bnoise, noise_2), lightmap.y, isGrass, isDHrange); + if(!hand) Indirect_lighting = ApplySSRT(Indirect_lighting, blockLightColor, MinimumLightColor, viewPos, normal, vec3(bnoise, noise_2), lightmap.y, isGrass, isDHrange); #endif #if defined END_SHADER diff --git a/shaders/lib/indirect_lighting_effects.glsl b/shaders/lib/indirect_lighting_effects.glsl index ed2dac1..2ef2c44 100644 --- a/shaders/lib/indirect_lighting_effects.glsl +++ b/shaders/lib/indirect_lighting_effects.glsl @@ -359,13 +359,12 @@ vec3 RT_alternate(vec3 dir, vec3 position, float noise, float stepsizes, bool ha vec3 ApplySSRT( in vec3 unchangedIndirect, in vec3 blockLightColor, + in vec3 minimumLightColor, vec3 viewPos, vec3 normal, vec3 noise, - - // vec3 indirectLightColor, - // vec3 minLightColor, + float lightmap, bool isGrass, @@ -395,7 +394,7 @@ vec3 ApplySSRT( #ifdef SKY_CONTRIBUTION_IN_SSRT #ifdef OVERWORLD_SHADER - skycontribution = doIndirectLighting(skyCloudsFromTexLOD(rayDir, colortex4, 0).rgb/30.0, minLightColor, lightmap) + blockLightColor; + skycontribution = doIndirectLighting(skyCloudsFromTexLOD(rayDir, colortex4, 0).rgb/30.0, minimumLightColor, lightmap) + blockLightColor; #else skycontribution = pow(skyCloudsFromTexLOD2(rayDir, colortex4, 6).rgb / 30.0,vec3(0.7)) + blockLightColor; #endif diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index 35e9c19..e4ea1a3 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -1,4 +1,4 @@ -#define SHADER_VERSION_LABEL 462 // [462] +#define SHADER_VERSION_LABEL 466 // [466] #define saturate(x) clamp(x,0.0,1.0)