From d662c799a2e057c41a8816ba1d35ee9b53b59722 Mon Sep 17 00:00:00 2001 From: Xonk Date: Fri, 1 Mar 2024 23:21:43 -0500 Subject: [PATCH] unfuck everything maybe --- shaders/dimensions/composite1.fsh | 19 +++++++++++++------ shaders/world0/composite2.vsh | 2 +- shaders/world0/composite3.fsh | 2 +- shaders/world0/composite3.vsh | 2 +- shaders/world0/composite4.fsh | 2 +- shaders/world0/composite4.vsh | 2 +- shaders/world0/composite5.fsh | 2 +- shaders/world0/composite5.vsh | 2 +- shaders/world0/composite6.fsh | 2 +- shaders/world0/composite6.vsh | 2 +- shaders/world0/composite7.fsh | 2 +- shaders/world0/composite7.vsh | 2 +- shaders/world0/composite8.fsh | 2 +- shaders/world0/composite8.vsh | 2 +- shaders/world0/composite9.fsh | 2 +- shaders/world0/composite9.vsh | 2 +- 16 files changed, 28 insertions(+), 21 deletions(-) diff --git a/shaders/dimensions/composite1.fsh b/shaders/dimensions/composite1.fsh index b7ffed7..9df057e 100644 --- a/shaders/dimensions/composite1.fsh +++ b/shaders/dimensions/composite1.fsh @@ -687,15 +687,22 @@ void BilateralUpscale_REUSE_Z(sampler2D tex1, sampler2D tex2, sampler2D depth, v #endif float EDGES = abs(offsetDepth - referenceDepth) < diffThreshold ? 1.0 : 1e-5; - - shadow_RESULT += texelFetch2D(tex1, posColor + radius + pos, 0).rgb * EDGES; - ssao_RESULT += texelFetch2D(tex2, posColor + radius + pos, 0).rg * EDGES; + // #ifdef Variable_Penumbra_Shadows + shadow_RESULT += texelFetch2D(tex1, posColor + radius + pos, 0).rgb * EDGES; + // #endif + + #if indirect_effect == 1 + ssao_RESULT += texelFetch2D(tex2, posColor + radius + pos, 0).rg * EDGES; + #endif SUM += EDGES; } - - filteredShadow = shadow_RESULT/SUM; - ambientEffects = ssao_RESULT/SUM; + // #ifdef Variable_Penumbra_Shadows + filteredShadow = shadow_RESULT/SUM; + // #endif + #if indirect_effect == 1 + ambientEffects = ssao_RESULT/SUM; + #endif } void main() { diff --git a/shaders/world0/composite2.vsh b/shaders/world0/composite2.vsh index a54cc5c..36d76b5 100644 --- a/shaders/world0/composite2.vsh +++ b/shaders/world0/composite2.vsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite2.vsh" \ No newline at end of file +#include "/dimensions/composite1.vsh" \ No newline at end of file diff --git a/shaders/world0/composite3.fsh b/shaders/world0/composite3.fsh index 704ae81..df6c56d 100644 --- a/shaders/world0/composite3.fsh +++ b/shaders/world0/composite3.fsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite3.fsh" \ No newline at end of file +#include "/dimensions/composite2.fsh" \ No newline at end of file diff --git a/shaders/world0/composite3.vsh b/shaders/world0/composite3.vsh index 3b5fa07..a54cc5c 100644 --- a/shaders/world0/composite3.vsh +++ b/shaders/world0/composite3.vsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite3.vsh" \ No newline at end of file +#include "/dimensions/composite2.vsh" \ No newline at end of file diff --git a/shaders/world0/composite4.fsh b/shaders/world0/composite4.fsh index 16de56b..704ae81 100644 --- a/shaders/world0/composite4.fsh +++ b/shaders/world0/composite4.fsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite4.fsh" \ No newline at end of file +#include "/dimensions/composite3.fsh" \ No newline at end of file diff --git a/shaders/world0/composite4.vsh b/shaders/world0/composite4.vsh index 8fcd849..3b5fa07 100644 --- a/shaders/world0/composite4.vsh +++ b/shaders/world0/composite4.vsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite4.vsh" \ No newline at end of file +#include "/dimensions/composite3.vsh" \ No newline at end of file diff --git a/shaders/world0/composite5.fsh b/shaders/world0/composite5.fsh index 48ea36a..16de56b 100644 --- a/shaders/world0/composite5.fsh +++ b/shaders/world0/composite5.fsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite5.fsh" \ No newline at end of file +#include "/dimensions/composite4.fsh" \ No newline at end of file diff --git a/shaders/world0/composite5.vsh b/shaders/world0/composite5.vsh index 719c1ce..8fcd849 100644 --- a/shaders/world0/composite5.vsh +++ b/shaders/world0/composite5.vsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite5.vsh" \ No newline at end of file +#include "/dimensions/composite4.vsh" \ No newline at end of file diff --git a/shaders/world0/composite6.fsh b/shaders/world0/composite6.fsh index b749c02..48ea36a 100644 --- a/shaders/world0/composite6.fsh +++ b/shaders/world0/composite6.fsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite6.fsh" \ No newline at end of file +#include "/dimensions/composite5.fsh" \ No newline at end of file diff --git a/shaders/world0/composite6.vsh b/shaders/world0/composite6.vsh index 8569ecc..719c1ce 100644 --- a/shaders/world0/composite6.vsh +++ b/shaders/world0/composite6.vsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite6.vsh" \ No newline at end of file +#include "/dimensions/composite5.vsh" \ No newline at end of file diff --git a/shaders/world0/composite7.fsh b/shaders/world0/composite7.fsh index 5847d03..b749c02 100644 --- a/shaders/world0/composite7.fsh +++ b/shaders/world0/composite7.fsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite7.fsh" \ No newline at end of file +#include "/dimensions/composite6.fsh" \ No newline at end of file diff --git a/shaders/world0/composite7.vsh b/shaders/world0/composite7.vsh index d517409..8569ecc 100644 --- a/shaders/world0/composite7.vsh +++ b/shaders/world0/composite7.vsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite7.vsh" \ No newline at end of file +#include "/dimensions/composite6.vsh" \ No newline at end of file diff --git a/shaders/world0/composite8.fsh b/shaders/world0/composite8.fsh index cab88f9..5847d03 100644 --- a/shaders/world0/composite8.fsh +++ b/shaders/world0/composite8.fsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite8.fsh" \ No newline at end of file +#include "/dimensions/composite7.fsh" \ No newline at end of file diff --git a/shaders/world0/composite8.vsh b/shaders/world0/composite8.vsh index cf1f994..d517409 100644 --- a/shaders/world0/composite8.vsh +++ b/shaders/world0/composite8.vsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite8.vsh" \ No newline at end of file +#include "/dimensions/composite7.vsh" \ No newline at end of file diff --git a/shaders/world0/composite9.fsh b/shaders/world0/composite9.fsh index 7f12057..cab88f9 100644 --- a/shaders/world0/composite9.fsh +++ b/shaders/world0/composite9.fsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite9.fsh" \ No newline at end of file +#include "/dimensions/composite8.fsh" \ No newline at end of file diff --git a/shaders/world0/composite9.vsh b/shaders/world0/composite9.vsh index 803cf3b..cf1f994 100644 --- a/shaders/world0/composite9.vsh +++ b/shaders/world0/composite9.vsh @@ -2,4 +2,4 @@ #define OVERWORLD_SHADER -#include "/dimensions/composite9.vsh" \ No newline at end of file +#include "/dimensions/composite8.vsh" \ No newline at end of file