Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2025-06-20 16:07:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix SSGI under water

Browse Source
This commit is contained in:
Xonk 2023-08-02 19:12:09 -04:00
parent 825f49a867
commit 7c5a4b39bd
1 changed files with 55 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
shaders/composite1.fsh
View File

@ -822,7 +822,6 @@ void main() {
scatterCoef *= 0.1; scatterCoef *= 0.1;
#endif #endif
float noise = blueNoise(); float noise = blueNoise();
float iswaterstuff = texture2D(colortex7,texcoord).a ; float iswaterstuff = texture2D(colortex7,texcoord).a ;
@ -895,11 +894,12 @@ void main() {
vec3 Indirect_SSS = vec3(0.0); vec3 Indirect_SSS = vec3(0.0);
vec3 debug = vec3(0.0); vec3 debug = vec3(0.0);
if ( z >= 1.) {//sky if ( z >= 1.) {//sky
//////////////////////////////// //////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
//////////////////////////////// SKY STUFF //////////////////////////////// //////////////////////////////// SKY STUFF ////////////////////////////////
//////////////////////////////// //////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifdef Compositing_Sky #ifdef Compositing_Sky
@ -932,9 +932,9 @@ void main() {
}else{//land }else{//land
//////////////////////////////// //////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////// DIRECT LIGHTING //////////////////////////////// //////////////////////////////// DIRECT LIGHTING ////////////////////////////////
//////////////////////////////// //////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
vec3 Direct_lighting = vec3(1.0); vec3 Direct_lighting = vec3(1.0);
@ -993,9 +993,9 @@ void main() {
if(outsideShadowMap && !iswater) Shadows = min(max(lightmap.y-0.8, 0.0) * 25,1.0); if(outsideShadowMap && !iswater) Shadows = min(max(lightmap.y-0.8, 0.0) * 25,1.0);
////////////////////////////////////////////////////////////////////////////////
//////////////////////////////// SUN SSS //////////////////////////////// //////////////////////////////// SUN SSS ////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
#if SSS_TYPE != 0 #if SSS_TYPE != 0
#ifndef Variable_Penumbra_Shadows #ifndef Variable_Penumbra_Shadows
@ -1046,9 +1046,9 @@ void main() {
#endif #endif
#endif #endif
//////////////////////////////// //////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////// INDIRECT LIGHTING //////////////////////////////// //////////////////////////////// INDIRECT LIGHTING ////////////////////////////////
//////////////////////////////// //////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////
vec3 Indirect_lighting = vec3(1.0); vec3 Indirect_lighting = vec3(1.0);
@ -1071,6 +1071,43 @@ void main() {
Indirect_lighting = vec3(0.0); Indirect_lighting = vec3(0.0);
#endif #endif
////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////// UNDER WATER SHADING ////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////
if ((isEyeInWater == 0 && iswater) || (isEyeInWater == 1 && !iswater)){
vec3 fragpos0 = toScreenSpace(vec3(texcoord/RENDER_SCALE-TAA_Offset*texelSize*0.5,z0));
float Vdiff = distance(fragpos,fragpos0);
float VdotU = np3.y;
float estimatedDepth = Vdiff * abs(VdotU); //assuming water plane
estimatedDepth = estimatedDepth;
// make it such that the estimated depth flips to be correct when entering water.
if (isEyeInWater == 1) estimatedDepth = (1.0-lightmap.y)*16.0;
float estimatedSunDepth = Vdiff; //assuming water plane
vec3 Absorbtion = exp2(-totEpsilon*estimatedDepth);
// caustics...
float Direct_caustics = waterCaustics(p3 + cameraPosition, WsunVec) * cloudShadow;
// float Ambient_Caustics = waterCaustics(p3 + cameraPosition, vec3(0.5, 1, 0.5));
// apply caustics to the lighting
DirectLightColor *= 1.0 + max(pow(Direct_caustics * 3.0, 2.0),0.0);
// Indirect_lighting *= 0.5 + max(pow(Ambient_Caustics, 2.0),0.0);
DirectLightColor *= Absorbtion;
if(isEyeInWater == 1 ) Indirect_lighting = (Indirect_lighting/exp2(-estimatedDepth*0.5)) * Absorbtion;
if(isEyeInWater == 0) DirectLightColor *= max(eyeBrightnessSmooth.y/240., 0.0);
DirectLightColor *= cloudShadow;
}
////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////// EFFECTS FOR INDIRECT ////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////
vec3 AO = vec3(1.0); vec3 AO = vec3(1.0);
float SkySSS = 0.0; float SkySSS = 0.0;
@ -1104,7 +1141,9 @@ void main() {
Indirect_lighting *= AO; Indirect_lighting *= AO;
////////////////////////////////////////////////////////////////////////////////
//////////////////////////////// SKY SSS //////////////////////////////// //////////////////////////////// SKY SSS ////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
#ifdef Ambient_SSS #ifdef Ambient_SSS
if (!hand){ if (!hand){
@ -1136,41 +1175,6 @@ void main() {
} }
#endif #endif
//////////////////////////////// ////////////////////////////////
//////////////////////////////// UNDER WATER SHADING ////////////////////////////////
//////////////////////////////// ////////////////////////////////
if ((isEyeInWater == 0 && iswater) || (isEyeInWater == 1 && !iswater)){
vec3 fragpos0 = toScreenSpace(vec3(texcoord/RENDER_SCALE-TAA_Offset*texelSize*0.5,z0));
float Vdiff = distance(fragpos,fragpos0);
float VdotU = np3.y;
float estimatedDepth = Vdiff * abs(VdotU); //assuming water plane
estimatedDepth = estimatedDepth;
// make it such that the estimated depth flips to be correct when entering water.
if (isEyeInWater == 1) estimatedDepth = (1.0-lightmap.y)*16.0;
float estimatedSunDepth = Vdiff; //assuming water plane
vec3 Absorbtion = exp2(-totEpsilon*estimatedDepth);
// caustics...
float Direct_caustics = waterCaustics(p3 + cameraPosition, WsunVec) * cloudShadow;
// float Ambient_Caustics = waterCaustics(p3 + cameraPosition, vec3(0.5, 1, 0.5));
// apply caustics to the lighting
DirectLightColor *= 1.0 + max(pow(Direct_caustics * 3.0, 2.0),0.0);
// Indirect_lighting *= 0.5 + max(pow(Ambient_Caustics, 2.0),0.0);
DirectLightColor *= Absorbtion;
if(isEyeInWater == 1 ) Indirect_lighting = (Indirect_lighting/exp2(-estimatedDepth*0.5)) * Absorbtion;
if(isEyeInWater == 0) DirectLightColor *= max(eyeBrightnessSmooth.y/240., 0.0);
DirectLightColor *= cloudShadow;
}
//////////////////////////////// //////////////////////////////// //////////////////////////////// ////////////////////////////////
//////////////////////////////// FINALIZE //////////////////////////////// //////////////////////////////// FINALIZE ////////////////////////////////
//////////////////////////////// //////////////////////////////// //////////////////////////////// ////////////////////////////////
@ -1225,11 +1229,11 @@ void main() {
} }
//////////////////////////////// //////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////// UNDERWATER FOG //////////////////////////////// //////////////////////////////// UNDERWATER FOG ////////////////////////////////
//////////////////////////////// //////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////
if (iswater){ if (iswater && isEyeInWater == 0){
vec3 fragpos0 = toScreenSpace(vec3(texcoord/RENDER_SCALE-TAA_Offset*texelSize*0.5,z0)); vec3 fragpos0 = toScreenSpace(vec3(texcoord/RENDER_SCALE-TAA_Offset*texelSize*0.5,z0));
float Vdiff = distance(fragpos,fragpos0); float Vdiff = distance(fragpos,fragpos0);
float VdotU = np3.y; float VdotU = np3.y;
@ -1244,9 +1248,12 @@ void main() {
vec3 lightningColor = (lightningEffect / 3) * (max(eyeBrightnessSmooth.y,0)/240.); vec3 lightningColor = (lightningEffect / 3) * (max(eyeBrightnessSmooth.y,0)/240.);
vec3 ambientColVol = max((averageSkyCol_Clouds / 30.0) * custom_lightmap_T, vec3(0.2,0.4,1.0) * (MIN_LIGHT_AMOUNT*0.01 + nightVision)) + lightningColor; vec3 ambientColVol = max((averageSkyCol_Clouds / 30.0) * custom_lightmap_T, vec3(0.2,0.4,1.0) * (MIN_LIGHT_AMOUNT*0.01 + nightVision)) + lightningColor;
if (isEyeInWater == 0) waterVolumetrics(gl_FragData[0].rgb, fragpos0, fragpos, estimatedDepth , estimatedSunDepth, Vdiff, noise, totEpsilon, scatterCoef, ambientColVol, lightColVol, dot(np3, WsunVec)); waterVolumetrics(gl_FragData[0].rgb, fragpos0, fragpos, estimatedDepth , estimatedSunDepth, Vdiff, noise, totEpsilon, scatterCoef, ambientColVol, lightColVol, dot(np3, WsunVec));
} }
////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////// MISC EFFECTS ////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
#if DOF_QUALITY == 5 #if DOF_QUALITY == 5