mirror of
https://github.com/X0nk/Bliss-Shader.git
synced 2024-12-23 01:59:39 +08:00
fix minimum light with HQ ssgi is enabled. fix commit number distplay
This commit is contained in:
parent
7607c0ff41
commit
9a6ffa360c
@ -1179,7 +1179,7 @@ void main() {
|
|||||||
|
|
||||||
// RTAO and/or SSGI
|
// RTAO and/or SSGI
|
||||||
#if indirect_effect == 3 || indirect_effect == 4
|
#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
|
#endif
|
||||||
|
|
||||||
#if defined END_SHADER
|
#if defined END_SHADER
|
||||||
|
@ -359,13 +359,12 @@ vec3 RT_alternate(vec3 dir, vec3 position, float noise, float stepsizes, bool ha
|
|||||||
vec3 ApplySSRT(
|
vec3 ApplySSRT(
|
||||||
in vec3 unchangedIndirect,
|
in vec3 unchangedIndirect,
|
||||||
in vec3 blockLightColor,
|
in vec3 blockLightColor,
|
||||||
|
in vec3 minimumLightColor,
|
||||||
|
|
||||||
vec3 viewPos,
|
vec3 viewPos,
|
||||||
vec3 normal,
|
vec3 normal,
|
||||||
vec3 noise,
|
vec3 noise,
|
||||||
|
|
||||||
// vec3 indirectLightColor,
|
|
||||||
// vec3 minLightColor,
|
|
||||||
float lightmap,
|
float lightmap,
|
||||||
|
|
||||||
bool isGrass,
|
bool isGrass,
|
||||||
@ -395,7 +394,7 @@ vec3 ApplySSRT(
|
|||||||
|
|
||||||
#ifdef SKY_CONTRIBUTION_IN_SSRT
|
#ifdef SKY_CONTRIBUTION_IN_SSRT
|
||||||
#ifdef OVERWORLD_SHADER
|
#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
|
#else
|
||||||
skycontribution = pow(skyCloudsFromTexLOD2(rayDir, colortex4, 6).rgb / 30.0,vec3(0.7)) + blockLightColor;
|
skycontribution = pow(skyCloudsFromTexLOD2(rayDir, colortex4, 6).rgb / 30.0,vec3(0.7)) + blockLightColor;
|
||||||
#endif
|
#endif
|
||||||
|
@ -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)
|
#define saturate(x) clamp(x,0.0,1.0)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user