improve fog upsampler and filtered effects upsampler. improve metals in specular reflections. fix end and nether not compiling, and fix SSAO making them black. redo water shader. added water caustics strength misc setting. add 2 new post process types "xonk tonemapp" and "full reinhard". create overdraw prevention for DH shadowmap. fix SSS with dh shadowmap. tweak screenspace shadow SSS to be better in the distance. add fog behind glass. move water fog to be done in the fog behind glass pass.

2025-06-22 00:37:35 +08:00 · 2024-03-01 22:48:09 -05:00
parent d4a239f223
commit 1ea16b150a
102 changed files with 1982 additions and 753 deletions
--- a/shaders/world1/composite.fsh
+++ b/shaders/world1/composite.fsh
@ -0,0 +1,5 @@
+#version 120
+
+#define END_SHADER
+
+#include "/dimensions/fogBehindTranslucent_pass.fsh"
--- a/shaders/world1/composite.vsh
+++ b/shaders/world1/composite.vsh
@ -0,0 +1,5 @@
+#version 120
+
+#define END_SHADER
+
+#include "/dimensions/fogBehindTranslucent_pass.vsh"
--- a/shaders/world1/composite1.fsh
+++ b/shaders/world1/composite1.fsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite1.fsh"
+#include "/dimensions/composite.fsh"
--- a/shaders/world1/composite1.vsh
+++ b/shaders/world1/composite1.vsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite1.vsh"
+#include "/dimensions/composite.vsh"
--- a/shaders/world1/composite10.fsh
+++ b/shaders/world1/composite10.fsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite10.fsh"
+#include "/dimensions/composite9.fsh"
--- a/shaders/world1/composite10.vsh
+++ b/shaders/world1/composite10.vsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite10.vsh"
+#include "/dimensions/composite9.vsh"
--- a/shaders/world1/composite11.fsh
+++ b/shaders/world1/composite11.fsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite11.fsh"
+#include "/dimensions/composite10.fsh"
--- a/shaders/world1/composite11.vsh
+++ b/shaders/world1/composite11.vsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite11.vsh"
+#include "/dimensions/composite10.vsh"
--- a/shaders/world1/composite12.fsh
+++ b/shaders/world1/composite12.fsh
@ -0,0 +1,5 @@
+#version 120
+
+#define END_SHADER
+
+#include "/dimensions/composite11.fsh"
--- a/shaders/world1/composite12.vsh
+++ b/shaders/world1/composite12.vsh
@ -0,0 +1,5 @@
+#version 120
+
+#define END_SHADER
+
+#include "/dimensions/composite11.vsh"
--- a/shaders/world1/composite2.fsh
+++ b/shaders/world1/composite2.fsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite2.fsh"
+#include "/dimensions/composite1.fsh"
--- a/shaders/world1/composite2.vsh
+++ b/shaders/world1/composite2.vsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite2.vsh"
+#include "/dimensions/composite1.vsh"
--- a/shaders/world1/composite3.fsh
+++ b/shaders/world1/composite3.fsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite3.fsh"
+#include "/dimensions/composite2.fsh"
--- a/shaders/world1/composite3.vsh
+++ b/shaders/world1/composite3.vsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite3.vsh"
+#include "/dimensions/composite2.vsh"
--- a/shaders/world1/composite4.fsh
+++ b/shaders/world1/composite4.fsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite4.fsh"
+#include "/dimensions/composite3.fsh"
--- a/shaders/world1/composite4.vsh
+++ b/shaders/world1/composite4.vsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite4.vsh"
+#include "/dimensions/composite3.vsh"
--- a/shaders/world1/composite5.fsh
+++ b/shaders/world1/composite5.fsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite5.fsh"
+#include "/dimensions/composite4.fsh"
--- a/shaders/world1/composite5.vsh
+++ b/shaders/world1/composite5.vsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite5.vsh"
+#include "/dimensions/composite4.vsh"
--- a/shaders/world1/composite6.fsh
+++ b/shaders/world1/composite6.fsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite6.fsh"
+#include "/dimensions/composite5.fsh"
--- a/shaders/world1/composite6.vsh
+++ b/shaders/world1/composite6.vsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite6.vsh"
+#include "/dimensions/composite5.vsh"
--- a/shaders/world1/composite7.fsh
+++ b/shaders/world1/composite7.fsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite7.fsh"
+#include "/dimensions/composite6.fsh"
--- a/shaders/world1/composite7.vsh
+++ b/shaders/world1/composite7.vsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite7.vsh"
+#include "/dimensions/composite6.vsh"
--- a/shaders/world1/composite8.fsh
+++ b/shaders/world1/composite8.fsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite8.fsh"
+#include "/dimensions/composite7.fsh"
--- a/shaders/world1/composite8.vsh
+++ b/shaders/world1/composite8.vsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite8.vsh"
+#include "/dimensions/composite7.vsh"
--- a/shaders/world1/composite9.fsh
+++ b/shaders/world1/composite9.fsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite9.fsh"
+#include "/dimensions/composite8.fsh"
--- a/shaders/world1/composite9.vsh
+++ b/shaders/world1/composite9.vsh
@ -2,4 +2,4 @@

 #define END_SHADER

-#include "/dimensions/composite9.vsh"
+#include "/dimensions/composite8.vsh"