Reimagined r2.0.1

EminGT · EminGT · commit cb80796273cc · 2023-02-25T03:31:49.000+03:00
diff --git a/shaders/lang/en_US.lang b/shaders/lang/en_US.lang
@@ -77,9 +77,13 @@ value.REFLECTION_QUALITY.1=§4Potato §e[*]
 value.REFLECTION_QUALITY.2=§aMedium
 value.REFLECTION_QUALITY.3=§bHigh
 
+option.REALTIME_SHADOWS=Real-Time Shadows
+option.REALTIME_SHADOWS.comment=Enables traditional shadows that move depending on the terrain and sun/moon angle. §e[*]§r Disabling this option will cause Light Shafts to not work, and will stop other shadow options from doing anything
+value.REALTIME_SHADOWS.true=§bON
+value.REALTIME_SHADOWS.false=§cOFF
+
 option.SHADOW_QUALITY=Shadow Sample Quality
-option.SHADOW_QUALITY.comment=Adjusts the quality of shadows. Every tier further reduces the shadow noise artifacts, and options lower than §bHigh§r enable optimised shadows on leaves. §e[*]§r Potato quality will disable real-time shadows, causing Light Shafts and Shadow Distance to not work.
-value.SHADOW_QUALITY.0=§4Potato §e[*]
+option.SHADOW_QUALITY.comment=Adjusts the quality of shadows. Every tier further reduces the shadow noise artifacts, and options lower than §bHigh§r enable optimised shadows on leaves.
 value.SHADOW_QUALITY.1=§eLow
 value.SHADOW_QUALITY.2=§aMedium
 value.SHADOW_QUALITY.3=§bHigh
diff --git a/shaders/lib/atmospherics/clouds/reimaginedClouds.glsl b/shaders/lib/atmospherics/clouds/reimaginedClouds.glsl
@@ -16,7 +16,7 @@ float InterleavedGradientNoise() {
     #endif
 }
 
-#if SHADOW_QUALITY > 0
+#ifdef REALTIME_SHADOWS
     vec3 GetShadowOnCloudPosition(vec3 tracePos) {
         vec3 wpos = PlayerToShadow(tracePos - cameraPosition);
         float distb = sqrt(wpos.x * wpos.x + wpos.y * wpos.y);
@@ -90,7 +90,7 @@ vec4 GetVolumetricClouds(float cloudAltitude, float distanceThreshold, inout flo
         if (GetCloudNoise(tracePos.xyz, cloudAltitude)) {
             float lightMult = 1.0;
 
-            #if SHADOW_QUALITY > 0
+            #ifdef REALTIME_SHADOWS
                 if (GetShadowOnCloud(tracePos, cloudAltitude, lowerPlaneAltitude, higherPlaneAltitude)) {
                     if (eyeBrightness.y != 240) continue;
                     else lightMult = 0.25;
diff --git a/shaders/lib/atmospherics/fog/waterFog.glsl b/shaders/lib/atmospherics/fog/waterFog.glsl
@@ -1,7 +1,7 @@
 #ifndef INCLUDE_WATER_FOG
 #define INCLUDE_WATER_FOG
     float GetWaterFog(float lViewPos) {
-        #if LIGHTSHAFT_QUALITY > 0 && SHADOW_QUALITY > 0
+        #if LIGHTSHAFT_QUALITY > 0 && defined REALTIME_SHADOWS
             float fog = lViewPos / 48.0;
             fog *= fog;
         #else
diff --git a/shaders/lib/atmospherics/volumetricLight.glsl b/shaders/lib/atmospherics/volumetricLight.glsl
@@ -112,7 +112,7 @@ vec4 GetVolumetricLight(inout float vlFactor, vec3 translucentMult, float lViewP
 		
 		float shadowSample = 1.0;
 		vec3 vlSample = vec3(1.0);
-		#if SHADOW_QUALITY > 0
+		#ifdef REALTIME_SHADOWS
 			wpos = shadowModelView * wpos;
 			wpos = shadowProjection * wpos;
 			wpos /= wpos.w;
diff --git a/shaders/lib/common.glsl b/shaders/lib/common.glsl
@@ -27,7 +27,8 @@
         #define CUSTOM_PBR
     #endif
 
-    #define SHADOW_QUALITY 2 //[0 1 2 3 4 5]
+    #define REALTIME_SHADOWS
+    #define SHADOW_QUALITY 2 //[1 2 3 4 5]
     const float shadowDistance = 192.0; //[64.0 80.0 96.0 112.0 128.0 160.0 192.0 224.0 256.0 320.0 384.0 512.0 768.0 1024.0]
     //#define ENTITY_SHADOWS
     #define SSAO
@@ -284,7 +285,7 @@
         vec3 caveFogColor = caveFogColorRaw;
     #endif
 
-    #if LIGHTSHAFT_QUALITY > 0 && SHADOW_QUALITY > 0
+    #if LIGHTSHAFT_QUALITY > 0 && defined REALTIME_SHADOWS
         vec3 waterFogColor = vec3(0.07, 0.08, 0.11) * vec3(1.0 + vsBrightness);
     #else
         vec3 waterFogColor = vec3(0.15, 0.26, 0.3) * vec3(1.0 + 0.5 * vsBrightness);
diff --git a/shaders/lib/lighting/mainLighting.glsl b/shaders/lib/lighting/mainLighting.glsl
@@ -10,7 +10,7 @@ uniform float darknessLightFactor;
 #include "/lib/colors/lightAndAmbientColors.glsl"
 #include "/lib/lighting/ggx.glsl"
 
-#if SHADOW_QUALITY > 0 && (defined OVERWORLD || defined END)
+#if defined REALTIME_SHADOWS && (defined OVERWORLD || defined END)
     #include "/lib/lighting/shadowSampling.glsl"
 #endif
 
@@ -47,7 +47,7 @@ void DoLighting(inout vec3 color, inout vec3 shadowMult, vec3 playerPos, vec3 vi
     // Shadows
     #if defined OVERWORLD || defined END
         float NdotL = dot(normalM, lightVec);
-        #if SHADOW_QUALITY == 0
+        #ifndef REALTIME_SHADOWS
             if (subsurfaceMode == 1) {
                 NdotU = 1.0;
                 NdotUmax0 = 1.0;
@@ -86,7 +86,7 @@ void DoLighting(inout vec3 color, inout vec3 shadowMult, vec3 playerPos, vec3 vi
         #endif
 
         if (shadowMult.r > 0.00001) {
-            #if SHADOW_QUALITY > 0
+            #ifdef REALTIME_SHADOWS
                 if (NdotLM > 0.0001) {
                     vec3 shadowMultBeforeLighting = shadowMult;
                     float shadowLength = shadowDistance * 0.9166667 - length(vec4(playerPos.x, playerPos.y, playerPos.y, playerPos.z));
@@ -284,7 +284,7 @@ void DoLighting(inout vec3 color, inout vec3 shadowMult, vec3 playerPos, vec3 vi
     #ifdef OVERWORLD
         ambientMult = vec3(mix(lightmapYM, pow2(lightmapYM) * lightmapYM, rainFactor));
 
-        #if SHADOW_QUALITY == 0
+        #ifndef REALTIME_SHADOWS
             float tweakFactor = 1.0 + 0.6 * (1.0 - pow2(pow2(pow2(noonFactor))));
             shadowLighting /= tweakFactor;
             ambientMult *= mix(tweakFactor, 1.0, 0.5 * NdotUmax0);
diff --git a/shaders/lib/materials/materialHandling/terrainMaterials.glsl b/shaders/lib/materials/materialHandling/terrainMaterials.glsl
@@ -13,7 +13,7 @@ if (mat < 10512) {
 
                                 DoFoliageColorTweaks(color.rgb, shadowMult, snowMinNdotU, lViewPos);
 
-                                #if SHADOW_QUALITY == 0
+                                #ifndef REALTIME_SHADOWS
                                     shadowMult *= 1.0 - 0.3 * (signMidCoordPos.y + 1.0) * (1.0 - abs(signMidCoordPos.x))
                                     + 0.5 * (1.0 - signMidCoordPos.y) * invNoonFactor; // consistency357381
                                 #endif
@@ -36,7 +36,7 @@ if (mat < 10512) {
 
                                 DoFoliageColorTweaks(color.rgb, shadowMult, snowMinNdotU, lViewPos);
 
-                                #if SHADOW_QUALITY == 0
+                                #ifndef REALTIME_SHADOWS
                                     shadowMult *= 1.0 + invNoonFactor; // consistency357381
                                 #endif
                             }
diff --git a/shaders/lib/materials/specificMaterials/terrain/leaves.glsl b/shaders/lib/materials/specificMaterials/terrain/leaves.glsl
@@ -12,6 +12,6 @@ materialMask = OSIEBCA * 253.0; // Reduced Edge TAA
     color.rgb = color.rgb * 0.5 + 0.5 * (color.rgb / glColor.rgb);
 #endif
 
-#if SHADOW_QUALITY > 0 && SHADOW_QUALITY < 3
+#if defined REALTIME_SHADOWS && SHADOW_QUALITY < 3
     shadowMult = vec3(sqrt1(max0(max(lmCoordM.y, min1(lmCoordM.x * 2.0)) - 0.95) * 20.0));
 #endif
diff --git a/shaders/program/composite.glsl b/shaders/program/composite.glsl
@@ -26,7 +26,7 @@ uniform sampler2D colortex0;
 uniform sampler2D depthtex0;
 uniform sampler2D depthtex1;
 
-#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
 	uniform int frameCounter;
 
 	uniform float viewWidth, viewHeight;
@@ -60,7 +60,7 @@ uniform sampler2D depthtex1;
 float SdotU = dot(sunVec, upVec);
 float sunFactor = SdotU < 0.0 ? clamp(SdotU + 0.375, 0.0, 0.75) / 0.75 : clamp(SdotU + 0.03125, 0.0, 0.0625) / 0.0625;
 
-#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
 	float sunVisibility = clamp(SdotU + 0.0625, 0.0, 0.125) / 0.125;
 	float sunVisibility2 = sunVisibility * sunVisibility;
 	float shadowTimeVar1 = abs(sunVisibility - 0.5) * 2.0;
@@ -86,7 +86,7 @@ float sunFactor = SdotU < 0.0 ? clamp(SdotU + 0.375, 0.0, 0.75) / 0.75 : clamp(S
 	#include "/lib/atmospherics/fog/bloomFog.glsl"
 #endif
 
-#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
 	#ifdef END
 		#include "/lib/atmospherics/enderBeams.glsl"
 	#endif
@@ -99,7 +99,7 @@ void main() {
 	float z0 = texelFetch(depthtex0, texelCoord, 0).r;
 	float z1 = texelFetch(depthtex1, texelCoord, 0).r;
 
-	#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+	#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
 		vec4 volumetricLight = vec4(0.0);
 		float vlFactorM = vlFactor;
 
@@ -129,20 +129,20 @@ void main() {
 		const vec3 underwaterMult = vec3(0.80, 0.87, 0.97) * 0.71;
 		color.rgb *= underwaterMult;
 
-		#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+		#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
 			volumetricLight.rgb *= pow2(underwaterMult);
 		#endif
 	} else if (isEyeInWater == 2) {
 		if (z1 == 1.0) color.rgb = fogColor * 5.0;
 		
-		#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+		#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
 			volumetricLight.rgb *= 0.0;
 		#endif
 	}
 	
 	color = pow(color, vec3(2.2));
 	
-	#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+	#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
 		#ifndef OVERWORLD
 			volumetricLight.rgb *= volumetricLight.rgb;
 		#endif
@@ -162,7 +162,7 @@ void main() {
 	/* DRAWBUFFERS:0 */
 	gl_FragData[0] = vec4(color, 1.0);
 	
-	#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+	#if LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
 		/* DRAWBUFFERS:04 */
 		gl_FragData[1] = vec4(vlFactorM, 0.0, 0.0, 1.0);
 	#endif
diff --git a/shaders/program/deferred1.glsl b/shaders/program/deferred1.glsl
@@ -12,7 +12,7 @@ noperspective in vec2 texCoord;
 
 flat in vec3 upVec, sunVec;
 
-#if LIGHTSHAFT_BEHAVIOUR == 1 && LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+#if LIGHTSHAFT_BEHAVIOUR == 1 && LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
     flat in float vlFactor;
 #endif
 
@@ -66,7 +66,7 @@ uniform sampler2D noisetex;
 	
 	uniform sampler2D colortex3;
 	
-	#if SHADOW_QUALITY > 0
+	#ifdef REALTIME_SHADOWS
 		uniform sampler2DShadow shadowtex0;
 	#endif
 #endif
@@ -114,7 +114,7 @@ float farMinusNear = far - near;
 	);
 #endif
 
-#if LIGHTSHAFT_BEHAVIOUR == 1 && LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+#if LIGHTSHAFT_BEHAVIOUR == 1 && LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
 #else
 	float vlFactor = 0.0;
 #endif
@@ -408,7 +408,7 @@ void main() {
 		#endif
 	}
 
-	#if LIGHTSHAFT_BEHAVIOUR == 1 && LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+	#if LIGHTSHAFT_BEHAVIOUR == 1 && LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
 		if (viewWidth + viewHeight - gl_FragCoord.x - gl_FragCoord.y < 1.5)
 			cloudLinearDepth = vlFactor;
 	#endif
@@ -432,12 +432,12 @@ noperspective out vec2 texCoord;
 
 flat out vec3 upVec, sunVec;
 
-#if LIGHTSHAFT_BEHAVIOUR == 1 && LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+#if LIGHTSHAFT_BEHAVIOUR == 1 && LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
     flat out float vlFactor;
 #endif
 
 //Uniforms//
-#if LIGHTSHAFT_BEHAVIOUR == 1 && LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+#if LIGHTSHAFT_BEHAVIOUR == 1 && LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
 	uniform float viewWidth, viewHeight;
 	
 	uniform sampler2D colortex4;
@@ -468,7 +468,7 @@ void main() {
 	upVec = normalize(gbufferModelView[1].xyz);
 	sunVec = GetSunVector();
 
-	#if LIGHTSHAFT_BEHAVIOUR == 1 && LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && SHADOW_QUALITY > 0 || defined END
+	#if LIGHTSHAFT_BEHAVIOUR == 1 && LIGHTSHAFT_QUALITY > 0 && defined OVERWORLD && defined REALTIME_SHADOWS || defined END
 		vlFactor = texelFetch(colortex4, ivec2(viewWidth-1, viewHeight-1), 0).r;
 
 		#ifdef END
diff --git a/shaders/program/gbuffers_entities.glsl b/shaders/program/gbuffers_entities.glsl
@@ -276,7 +276,7 @@ void main() {
 		} else if (entityId == 50084) { // Slime
 			gl_Position.z -= 0.00015;
 		}
-		#if SHADOW_QUALITY == 0
+		#ifndef REALTIME_SHADOWS
 			else if (entityId == 50016) { // Player
 				if (glColor.a < 0.5) gl_Position.z += 0.0005;
 			}
diff --git a/shaders/shaders.properties b/shaders/shaders.properties
@@ -1,15 +1,15 @@
 #Profiles
-    profile.POTATO   = SHADOW_QUALITY=0 shadowDistance=64.0 !ENTITY_SHADOWS WATER_QUALITY=1 REFLECTION_QUALITY=1 LIGHTSHAFT_QUALITY=0
-    profile.LOW      = SHADOW_QUALITY=2 shadowDistance=64.0 !ENTITY_SHADOWS WATER_QUALITY=1 REFLECTION_QUALITY=2 LIGHTSHAFT_QUALITY=1
-    profile.MEDIUM   = SHADOW_QUALITY=2 shadowDistance=128.0 !ENTITY_SHADOWS WATER_QUALITY=2 REFLECTION_QUALITY=2 LIGHTSHAFT_QUALITY=2
-    profile.HIGH     = SHADOW_QUALITY=2 shadowDistance=192.0 !ENTITY_SHADOWS WATER_QUALITY=2 REFLECTION_QUALITY=3 LIGHTSHAFT_QUALITY=3
-    profile.VERYHIGH = SHADOW_QUALITY=3 shadowDistance=224.0 !ENTITY_SHADOWS WATER_QUALITY=2 REFLECTION_QUALITY=3 LIGHTSHAFT_QUALITY=4
-    profile.ULTRA    = SHADOW_QUALITY=4 shadowDistance=256.0 ENTITY_SHADOWS WATER_QUALITY=2 REFLECTION_QUALITY=3 LIGHTSHAFT_QUALITY=4
+    profile.POTATO   = !REALTIME_SHADOWS SHADOW_QUALITY=2 shadowDistance=64.0 !ENTITY_SHADOWS WATER_QUALITY=1 REFLECTION_QUALITY=1 LIGHTSHAFT_QUALITY=0
+    profile.LOW      = REALTIME_SHADOWS SHADOW_QUALITY=2 shadowDistance=64.0 !ENTITY_SHADOWS WATER_QUALITY=1 REFLECTION_QUALITY=2 LIGHTSHAFT_QUALITY=1
+    profile.MEDIUM   = REALTIME_SHADOWS SHADOW_QUALITY=2 shadowDistance=128.0 !ENTITY_SHADOWS WATER_QUALITY=2 REFLECTION_QUALITY=2 LIGHTSHAFT_QUALITY=2
+    profile.HIGH     = REALTIME_SHADOWS SHADOW_QUALITY=2 shadowDistance=192.0 !ENTITY_SHADOWS WATER_QUALITY=2 REFLECTION_QUALITY=3 LIGHTSHAFT_QUALITY=3
+    profile.VERYHIGH = REALTIME_SHADOWS SHADOW_QUALITY=3 shadowDistance=224.0 !ENTITY_SHADOWS WATER_QUALITY=2 REFLECTION_QUALITY=3 LIGHTSHAFT_QUALITY=4
+    profile.ULTRA    = REALTIME_SHADOWS SHADOW_QUALITY=4 shadowDistance=256.0 ENTITY_SHADOWS WATER_QUALITY=2 REFLECTION_QUALITY=3 LIGHTSHAFT_QUALITY=4
 
 #Screen Setup
     screen=<empty> <empty> CMPR SHADER_STYLE <profile> RP_MODE <empty> <empty> [PERFORMANCE_SETTINGS] [CAMERA_SETTINGS] [MATERIAL_SETTINGS] [ATMOSPHERE_SETTINGS] [LIGHTING_SETTINGS] [OTHER_SETTINGS]
     
-    screen.PERFORMANCE_SETTINGS=<empty> <empty> <profile> <empty> <empty> <empty> WATER_QUALITY REFLECTION_QUALITY SHADOW_QUALITY shadowDistance LIGHTSHAFT_QUALITY ENTITY_SHADOWS
+    screen.PERFORMANCE_SETTINGS=<empty> <empty> <profile> <empty> <empty> <empty> REALTIME_SHADOWS shadowDistance SHADOW_QUALITY ENTITY_SHADOWS WATER_QUALITY REFLECTION_QUALITY LIGHTSHAFT_QUALITY
 
     screen.MATERIAL_SETTINGS=<empty> <empty> [IPBR_SETTINGS] [CUSTOM_PBR_SETTINGS] <empty> <empty> WATER_STYLE_DEFINE [WAVING_SETTINGS] RAIN_PUDDLES
         screen.IPBR_SETTINGS=<empty> <empty> GENERATED_NORMALS COATED_TEXTURES FANCY_GLASS GLOWING_ORES EMISSIVE_REDSTONE_BLOCK
@@ -51,11 +51,9 @@
     alphaTest.gbuffers_spidereyes=GREATER 0.0001
 
 #Link Programs to Options
-    #if SHADOW_QUALITY == 0
-        program.world0/shadow.enabled=false
-        program.world-1/shadow.enabled=false
-        program.world1/shadow.enabled=false
-    #endif
+    program.world0/shadow.enabled=REALTIME_SHADOWS
+    program.world-1/shadow.enabled=REALTIME_SHADOWS
+    program.world1/shadow.enabled=REALTIME_SHADOWS
     program.world0/composite2.enabled=MOTION_BLURRING
     program.world-1/composite2.enabled=MOTION_BLURRING
     program.world1/composite2.enabled=MOTION_BLURRING
