diff --git a/shaders/dimensions/all_particles.fsh b/shaders/dimensions/all_particles.fsh index 227b437..140eb58 100644 --- a/shaders/dimensions/all_particles.fsh +++ b/shaders/dimensions/all_particles.fsh @@ -3,6 +3,7 @@ #define AMBIENT_LIGHT_RELATED_SETTINGS #define VOLUMETRIC_CLOUD_RELATED_SETTINGS #define WATER_RELATED_SETTINGS +#define ANTIALIASING_RELATED_SETTINGS #include "/lib/settings.glsl" // #if defined END_SHADER || defined NETHER_SHADER diff --git a/shaders/dimensions/all_translucent.fsh b/shaders/dimensions/all_translucent.fsh index ab6dcc6..826b259 100644 --- a/shaders/dimensions/all_translucent.fsh +++ b/shaders/dimensions/all_translucent.fsh @@ -9,6 +9,7 @@ #define AMBIENT_LIGHT_RELATED_SETTINGS #define VOLUMETRIC_CLOUD_RELATED_SETTINGS #define WATER_RELATED_SETTINGS +#define ANTIALIASING_RELATED_SETTINGS #include "/lib/settings.glsl" #undef FLASHLIGHT_BOUNCED_INDIRECT diff --git a/shaders/dimensions/composite.fsh b/shaders/dimensions/composite.fsh index f29bc50..3c85a42 100644 --- a/shaders/dimensions/composite.fsh +++ b/shaders/dimensions/composite.fsh @@ -415,7 +415,7 @@ void main() { vec3 FlatNormals = normalize(texture2D(colortex15,texcoord).rgb * 2.0 - 1.0); - #if defined indirect_effect == SSAO_FILTERED || indirect_effect == SSAO_HQ + #if indirect_effect == SSAO_FILTERED || indirect_effect == SSAO_HQ if(z >= 1.0) FlatNormals = normal; vec2 SSAO_SSS = SSAO(viewPos, worldToView(normal), worldToView(FlatNormals), hand, noise); diff --git a/shaders/dimensions/composite10.fsh b/shaders/dimensions/composite10.fsh index 7da7899..43a9789 100644 --- a/shaders/dimensions/composite10.fsh +++ b/shaders/dimensions/composite10.fsh @@ -1,7 +1,7 @@ #define DEPTH_OF_FIELD_RELATED_SETTINGS #define POST_PROCESSING_RELATED_SETTINGS +#define ANTIALIASING_RELATED_SETTINGS #include "/lib/settings.glsl" - #include "/lib/res_params.glsl" diff --git a/shaders/dimensions/composite11.fsh b/shaders/dimensions/composite11.fsh index d208835..64588ba 100644 --- a/shaders/dimensions/composite11.fsh +++ b/shaders/dimensions/composite11.fsh @@ -1,4 +1,5 @@ #define POST_PROCESSING_RELATED_SETTINGS +#define ANTIALIASING_RELATED_SETTINGS #include "/lib/settings.glsl" varying vec2 texcoord; diff --git a/shaders/dimensions/composite2.fsh b/shaders/dimensions/composite2.fsh index b29677e..2058e01 100644 --- a/shaders/dimensions/composite2.fsh +++ b/shaders/dimensions/composite2.fsh @@ -1,3 +1,5 @@ + +#define ANTIALIASING_RELATED_SETTINGS #define NETHER_RELATED_SETTINGS #define END_RELATED_SETTINGS #define SKY_RELATED_SETTINGS diff --git a/shaders/dimensions/composite5.vsh b/shaders/dimensions/composite5.vsh index e651986..4a21589 100644 --- a/shaders/dimensions/composite5.vsh +++ b/shaders/dimensions/composite5.vsh @@ -1,17 +1,10 @@ -#define ANTIALIASING_RELATED_SETTINGS -#include "/lib/settings.glsl" #include "/lib/util.glsl" -#include "/lib/res_params.glsl" varying vec2 texcoord; flat varying float tempOffsets; uniform sampler2D colortex4; uniform int frameCounter; - -uniform int framemod8; -#include "/lib/TAA_jitter.glsl" - void main() { gl_Position = ftransform(); @@ -19,7 +12,7 @@ void main() { tempOffsets = HaltonSeq2(frameCounter%10000); - #if TAA_MODE == 3 - gl_Position.xy = (gl_Position.xy*0.5+0.5)*RENDER_SCALE*2.0-1.0; - #endif + // #if TAA_MODE == 3 + // gl_Position.xy = (gl_Position.xy*0.5+0.5)*RENDER_SCALE*2.0-1.0; + // #endif } diff --git a/shaders/dimensions/deferred.vsh b/shaders/dimensions/deferred.vsh index 6b8e641..f7fc5c3 100644 --- a/shaders/dimensions/deferred.vsh +++ b/shaders/dimensions/deferred.vsh @@ -6,6 +6,7 @@ #define SEASONS_RELATED_SETTINGS #define VOLUMETRIC_FOG_RELATED_SETTINGS #define SCENE_CONTROLLER_RELATED_SETTINGS +#define ANTIALIASING_RELATED_SETTINGS #include "/lib/settings.glsl" #include "/lib/res_params.glsl" diff --git a/shaders/dimensions/final.fsh b/shaders/dimensions/final.fsh index fdd84e2..499363e 100644 --- a/shaders/dimensions/final.fsh +++ b/shaders/dimensions/final.fsh @@ -1,4 +1,5 @@ #define GAMEPLAY_EFFECTS_RELATED_SETTINGS +#define ANTIALIASING_RELATED_SETTINGS #define POST_PROCESSING_RELATED_SETTINGS #include "/lib/settings.glsl" diff --git a/shaders/lib/res_params.glsl b/shaders/lib/res_params.glsl index 784e21c..4443e13 100644 --- a/shaders/lib/res_params.glsl +++ b/shaders/lib/res_params.glsl @@ -1,6 +1,5 @@ #if TAA_MODE == 3 #define SCALE_FACTOR 0.75 // render resolution multiplier. below 0.5 not recommended [0.10 0.15 0.20 0.25 0.30 0.35 0.40 0.45 0.50 0.55 0.60 0.65 0.70 0.75 0.80 0.85 0.90 0.95 1.0] - #define RENDER_SCALE vec2(SCALE_FACTOR, SCALE_FACTOR) #define UPSCALING_SHARPNENING 2.0 - SCALE_FACTOR - SCALE_FACTOR #else @@ -8,5 +7,5 @@ #define UPSCALING_SHARPNENING 0.0 #endif -#define BLOOM_QUALITY 0.5 // Reduces the resolution at which bloom is computed. (0.5 = half of default resolution) [0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1. ] -#define VL_RENDERING_RESOLUTION_SCALE 0.5 // Reduces the resolution at which volumetric fog is computed. (0.5 = half of default resolution) [0.25 0.5 1.0] \ No newline at end of file +#define BLOOM_QUALITY 0.5 // [0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1. ] +#define VL_RENDERING_RESOLUTION_SCALE 0.5 // [0.25 0.5 1.0] \ No newline at end of file diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index 230c783..2659e2c 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -170,9 +170,6 @@ #if defined ANTIALIASING_RELATED_SETTINGS #define TAA_MODE 2 // [0 1 2 3] - // #define TAA - // #define RESPONSIVE_TAA - // #define TAA_UPSCALING // #define SCREENSHOT_MODE #define BLEND_FACTOR 0.125 // [0.01 0.02 0.03 0.04 0.05 0.06 0.08 0.1 0.12 0.125 0.14 0.16 0.18 0.20 0.25 0.30 0.40 0.50 0.60 0.70 0.80 0.90 1.00] #define BLEND_FACTOR_DURING_MOVEMENT 0.125 // [0.01 0.02 0.03 0.04 0.05 0.06 0.08 0.1 0.12 0.125 0.14 0.16 0.18 0.20 0.25 0.30 0.40 0.50 0.60 0.70 0.80 0.90 1.00] @@ -245,13 +242,13 @@ #define DEFERRED_SSR_QUALITY 30 // [0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100 200 300 400 500] #define DEFERRED_BACKGROUND_REFLECTION #define DEFERRED_ROUGH_REFLECTION - #ifdef DEFERRED_SPECULAR + #if defined DEFERRED_SPECULAR #endif #if DEFERRED_SSR_QUALITY > -1 #endif - #ifdef DEFERRED_BACKGROUND_REFLECTION + #if defined DEFERRED_BACKGROUND_REFLECTION #endif - #ifdef DEFERRED_ROUGH_REFLECTION + #if defined DEFERRED_ROUGH_REFLECTION #endif #endif #if defined FORWARD_SPECULAR_RELATED_SETTINGS @@ -259,13 +256,13 @@ #define FORWARD_SSR_QUALITY 30 // [0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100 200 300 400 500] #define FORWARD_BACKGROUND_REFLECTION // #define FORWARD_ROUGH_REFLECTION - #ifdef FORWARD_SPECULAR + #if defined FORWARD_SPECULAR #endif #if FORWARD_SSR_QUALITY > -1 #endif - #ifdef FORWARD_BACKGROUND_REFLECTION + #if defined FORWARD_BACKGROUND_REFLECTION #endif - #ifdef FORWARD_ROUGH_REFLECTION + #if defined FORWARD_ROUGH_REFLECTION #endif #endif #endif @@ -388,7 +385,7 @@ #define moonColorBase vec3(moonColorR,moonColorG,moonColorB) * moon_illuminance #else #define sunColorBase blackbody(Sun_temp) * sun_illuminance - #ifdef MOONPHASE_BASED_MOONLIGHT + #if defined MOONPHASE_BASED_MOONLIGHT uniform int moonPhase; #define phasebrightness (abs(4-moonPhase)) #define moonlightbrightness (phasebrightness/4.0) @@ -404,7 +401,7 @@ #define WATER_ON_CAMERA_EFFECT #define ON_FIRE_DISTORT_EFFECT #define ON_FIRE_DISTORT_EFFECT_STRENGTH 0.7 // [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0] - #ifdef IS_IRIS + #if defined IS_IRIS #define DAMAGE_TAKEN_EFFECT #define LOW_HEALTH_EFFECT #define LOW_HEALTH_EFFECT_START 6.0 // [1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0] @@ -582,11 +579,9 @@ #define CUSTOM_JUNGLE_PROFILE_1_FOG_COLOR_B 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0 1.01 1.02 1.03 1.04 1.05 1.06 1.07 1.08 1.09 1.1 1.11 1.12 1.13 1.14 1.15 1.16 1.17 1.18 1.19 1.2 1.21 1.22 1.23 1.24 1.25 1.26 1.27 1.28 1.29 1.3 1.31 1.32 1.33 1.34 1.35 1.36 1.37 1.38 1.39 1.4 1.41 1.42 1.43 1.44 1.45 1.46 1.47 1.48 1.49 1.5 1.51 1.52 1.53 1.54 1.55 1.56 1.57 1.58 1.59 1.6 1.61 1.62 1.63 1.64 1.65 1.66 1.67 1.68 1.69 1.7 1.71 1.72 1.73 1.74 1.75 1.76 1.77 1.78 1.79 1.8 1.81 1.82 1.83 1.84 1.85 1.86 1.87 1.88 1.89 1.9 1.91 1.92 1.93 1.94 1.95 1.96 1.97 1.98 1.99 2.0] #endif #endif -/////////////////////////////// -// ----- MISC SETTINGS ----- // -/////////////////////////////// + // #define USE_CUSTOM_DIFFUSE_LIGHTING_COLORS -#ifdef USE_CUSTOM_DIFFUSE_LIGHTING_COLORS +#if defined USE_CUSTOM_DIFFUSE_LIGHTING_COLORS #define DIRECTLIGHT_DIFFUSE_R 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] #define DIRECTLIGHT_DIFFUSE_G 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] #define DIRECTLIGHT_DIFFUSE_B 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] @@ -595,7 +590,7 @@ #define INDIRECTLIGHT_DIFFUSE_B 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] #endif // #define USE_CUSTOM_CLOUD_LIGHTING_COLORS -#ifdef USE_CUSTOM_CLOUD_LIGHTING_COLORS +#if defined USE_CUSTOM_CLOUD_LIGHTING_COLORS #define DIRECTLIGHT_CLOUDS_R 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] #define DIRECTLIGHT_CLOUDS_G 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] #define DIRECTLIGHT_CLOUDS_B 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] @@ -604,7 +599,7 @@ #define INDIRECTLIGHT_CLOUDS_B 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] #endif // #define USE_CUSTOM_FOG_LIGHTING_COLORS -#ifdef USE_CUSTOM_FOG_LIGHTING_COLORS +#if defined USE_CUSTOM_FOG_LIGHTING_COLORS #define DIRECTLIGHT_FOG_R 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] #define DIRECTLIGHT_FOG_G 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] #define DIRECTLIGHT_FOG_B 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] @@ -613,7 +608,7 @@ #define INDIRECTLIGHT_FOG_B 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] #endif // #define USE_CUSTOM_SKY_GROUND_LIGHTING_COLORS -#ifdef USE_CUSTOM_SKY_GROUND_LIGHTING_COLORS +#if defined USE_CUSTOM_SKY_GROUND_LIGHTING_COLORS #define SKY_GROUND_R 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] #define SKY_GROUND_G 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] #define SKY_GROUND_B 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] @@ -625,13 +620,13 @@ #define UseQuarterResDepth // #define AEROCHROME_MODE // Infra-red film colors ^~^ -#ifdef AEROCHROME_MODE +#if defined AEROCHROME_MODE // #define AEROCHROME_WOOL_ENABLED // Technically wool things should be affected but it affects a lot of builds and stuff #define AEROCHROME_PINKNESS 0.3 // How pink it is from red [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0] const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631), AEROCHROME_PINKNESS); #endif // #define PLANET_CURVATURE -#ifdef PLANET_CURVATURE +#if defined PLANET_CURVATURE #define CURVATURE_AMOUNT 1.0 // [-10.0 -9.0 -8.0 -7.0 -6.0 -5.0 -4.0 -3.0 -2.0 -1.9 -1.8 -1.7 -1.6 -1.5 -1.4 -1.3 -1.2 -1.1 -1.0 -0.9 -0.8 -0.7 -0.6 -0.5 -0.4 -0.3 -0.2 -0.1 0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0] #endif @@ -658,9 +653,10 @@ /////////////////////////////////////////// #define DISTORT_SHADOWMAP + #if defined DISTANT_HORIZONS // #define DISTANT_HORIZONS_SHADOWMAP - #ifdef DISTANT_HORIZONS_SHADOWMAP + #if defined DISTANT_HORIZONS_SHADOWMAP #undef DISTORT_SHADOWMAP const float shadowNearPlane = -1.0; const float shadowFarPlane = -1.0; @@ -683,7 +679,6 @@ #define DH_SSS_THRESHOLD_B 0.3 // [-1.0 -0.99 -0.98 -0.96 -0.94 -0.92 -0.9 -0.88 -0.86 -0.84 -0.82 -0.8 -0.78 -0.76 -0.74 -0.72 -0.7 -0.68 -0.66 -0.64 -0.62 -0.6 -0.58 -0.56 -0.54 -0.52 -0.5 -0.48 -0.46 -0.44 -0.42 -0.4 -0.38 -0.36 -0.34 -0.32 -0.3 -0.28 -0.26 -0.24 -0.22 -0.2 -0.18 -0.16 -0.14 -0.12 -0.1 -0.08 -0.06 -0.04 -0.02 0.0 0.02 0.04 0.06 0.08 0.1 0.12 0.14 0.16 0.18 0.2 0.22 0.24 0.26 0.28 0.3 0.32 0.34 0.36 0.38 0.4 0.42 0.44 0.46 0.48 0.5 0.52 0.54 0.56 0.58 0.6 0.62 0.64 0.66 0.68 0.7 0.72 0.74 0.76 0.78 0.8 0.82 0.84 0.86 0.88 0.9 0.92 0.94 0.96 0.98 0.99 1.0] #endif - /////////////////////////////////////////// // ----- FLOODFILL [LPV] SETTINGS ----- // /////////////////////////////////////////// @@ -703,8 +698,8 @@ // Fix for making nether/end work until next Iris release to fix shadow matrices //#define LPV_NOSHADOW_HACK -#ifdef LPV_ENABLED - #ifdef IRIS_FEATURE_CUSTOM_IMAGES +#if defined LPV_ENABLED + #if defined IRIS_FEATURE_CUSTOM_IMAGES #define IS_LPV_ENABLED const float voxelDistance = 64.0; @@ -751,7 +746,7 @@ #define DEBUG_VIEW debug_OFF // [debug_OFF debug_SHADOWMAP debug_NORMALS debug_SPECULAR debug_INDIRECT debug_DIRECT debug_VIEW_POSITION debug_DH_WATER_BLENDING debug_FILTERED_STUFF debug_DEPTHTEX0 debug_DEPTHTEX1 debug_MATERIAL_SSS debug_MATERIAL_EMISSION debug_LIGHTMAPS debug_FORWARD_RENDERING debug_FORWARD_COLOR_TINT debug_DEFERRED_RENDERING] // #define THE_ORB -#ifdef THE_ORB +#if defined THE_ORB #define ORB_X 0 // [-200 -195 -190 -185 -180 -175 -170 -165 -160 -155 -150 -145 -140 -135 -130 -125 -120 -115 -110 -105 -100 -95 -90 -85 -80 -75 -70 -65 -60 -55 -50 -45 -40 -35 -30 -25 -20 -15 -10 -5 0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100 105 110 115 120 125 130 135 140 145 150 155 160 165 170 175 180 185 190 195 200] #define ORB_Y 0 // [-200 -195 -190 -185 -180 -175 -170 -165 -160 -155 -150 -145 -140 -135 -130 -125 -120 -115 -110 -105 -100 -95 -90 -85 -80 -75 -70 -65 -60 -55 -50 -45 -40 -35 -30 -25 -20 -15 -10 -5 0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100 105 110 115 120 125 130 135 140 145 150 155 160 165 170 175 180 185 190 195 200 210 220 230 240 250] #define ORB_Z 0 // [-200 -195 -190 -185 -180 -175 -170 -165 -160 -155 -150 -145 -140 -135 -130 -125 -120 -115 -110 -105 -100 -95 -90 -85 -80 -75 -70 -65 -60 -55 -50 -45 -40 -35 -30 -25 -20 -15 -10 -5 0 5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100 105 110 115 120 125 130 135 140 145 150 155 160 165 170 175 180 185 190 195 200] @@ -760,88 +755,89 @@ #define ORB_B 1.0 // [0.00 0.01 0.02 0.03 0.04 0.05 0.06 0.07 0.08 0.09 0.1 0.11 0.12 0.13 0.14 0.15 0.16 0.17 0.18 0.19 0.2 0.21 0.22 0.23 0.24 0.25 0.26 0.27 0.28 0.29 0.3 0.31 0.32 0.33 0.34 0.35 0.36 0.37 0.38 0.39 0.4 0.41 0.42 0.43 0.44 0.45 0.46 0.47 0.48 0.49 0.5 0.51 0.52 0.53 0.54 0.55 0.56 0.57 0.58 0.59 0.6 0.61 0.62 0.63 0.64 0.65 0.66 0.67 0.68 0.69 0.7 0.71 0.72 0.73 0.74 0.75 0.76 0.77 0.78 0.79 0.8 0.81 0.82 0.83 0.84 0.85 0.86 0.87 0.88 0.89 0.9 0.91 0.92 0.93 0.94 0.95 0.96 0.97 0.98 0.99 1.0] #define ORB_ColMult 1.0 // [0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0 1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 1.9 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 4.0 4.1 4.2 4.3 4.4 4.5 4.6 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7 5.8 5.9 6.0 6.1 6.2 6.3 6.4 6.5 6.6 6.7 6.8 6.9 7.0 7.1 7.2 7.3 7.4 7.5 7.6 7.7 7.8 7.9 8.0 8.1 8.2 8.3 8.4 8.5 8.6 8.7 8.8 8.9 9.0 9.1 9.2 9.3 9.4 9.5 9.6 9.7 9.8 9.9 10.0 ] #endif -#ifdef IS_IRIS + +#if defined IS_IRIS // #define TRANSLUCENT_ENTITIES #endif // fix settings -#ifdef ISOLATE_RESOURCEPACK_SKY +#if defined ISOLATE_RESOURCEPACK_SKY #endif -#ifdef DH_TAA_JITTER +#if defined DH_TAA_JITTER #endif -#ifdef DH_SCREENSPACE_REFLECTIONS +#if defined DH_SCREENSPACE_REFLECTIONS #endif -#ifdef DH_SUBSURFACE_SCATTERING +#if defined DH_SUBSURFACE_SCATTERING #endif -#ifdef TRANSLUCENT_ENTITIES +#if defined TRANSLUCENT_ENTITIES #endif -#ifdef RENDER_ENTITY_SHADOWS +#if defined RENDER_ENTITY_SHADOWS #endif #if RESOURCEPACK_SKY == 0 #endif -#ifdef VANILLA_SUN_AND_MOON +#if defined VANILLA_SUN_AND_MOON #endif -#ifdef LIGHTNING_FLASH +#if defined LIGHTNING_FLASH #endif #if SHADER_VERSION_LABEL > 0 #endif #if DH_KNOWN_ISSUES == 0 #endif -#ifdef PARTICLE_RENDERING_FIX +#if defined PARTICLE_RENDERING_FIX #endif -#ifdef RENDER_PLAYER_SHADOWS +#if defined RENDER_PLAYER_SHADOWS #endif -#ifdef LPV_VL_FOG_ILLUMINATION +#if defined LPV_VL_FOG_ILLUMINATION #endif -#ifdef OLD_CAVE_DETECTION +#if defined OLD_CAVE_DETECTION #endif -#ifdef FORCE_TRANSLUCENT_GLASS +#if defined FORCE_TRANSLUCENT_GLASS #endif -#ifdef USE_CUSTOM_DIFFUSE_LIGHTING_COLORS +#if defined USE_CUSTOM_DIFFUSE_LIGHTING_COLORS #endif -#ifdef USE_CUSTOM_CLOUD_LIGHTING_COLORS +#if defined USE_CUSTOM_CLOUD_LIGHTING_COLORS #endif -#ifdef USE_CUSTOM_FOG_LIGHTING_COLORS +#if defined USE_CUSTOM_FOG_LIGHTING_COLORS #endif -#ifdef USE_CUSTOM_SKY_GROUND_LIGHTING_COLORS +#if defined USE_CUSTOM_SKY_GROUND_LIGHTING_COLORS #endif -#ifdef COLOR_TEST_FOR_SUBSURFACE_SCATTERING_MATERIAL +#if defined COLOR_TEST_FOR_SUBSURFACE_SCATTERING_MATERIAL #endif -#ifdef CAVE_FOG +#if defined CAVE_FOG #endif -#ifdef CAVE_FOG_DARKEN_SKY +#if defined CAVE_FOG_DARKEN_SKY #endif #if TAA_MODE > 0 #endif -#ifdef DAILY_WEATHER_PROFILE +#if defined DAILY_WEATHER_PROFILE #endif -#ifdef DAILY_RAIN_PROFILE +#if defined DAILY_RAIN_PROFILE #endif -#ifdef BIOME_SPECIFIC_RAIN_PROFILE +#if defined BIOME_SPECIFIC_RAIN_PROFILE #endif -#ifdef BIOME_SPECIFIC_PROFILE +#if defined BIOME_SPECIFIC_PROFILE #endif -#ifdef FLASHLIGHT +#if defined FLASHLIGHT #endif -#ifdef FLASHLIGHT_SPECULAR +#if defined FLASHLIGHT_SPECULAR #endif -#ifdef FLASHLIGHT_BOUNCED_INDIRECT +#if defined FLASHLIGHT_BOUNCED_INDIRECT #endif -#ifdef FLASHLIGHT_FOG_ILLUMINATION +#if defined FLASHLIGHT_FOG_ILLUMINATION #endif -#ifdef LOW_HEALTH_EFFECT +#if defined LOW_HEALTH_EFFECT #endif -#ifdef DAMAGE_TAKEN_EFFECT +#if defined DAMAGE_TAKEN_EFFECT #endif -#ifdef WATER_ON_CAMERA_EFFECT +#if defined WATER_ON_CAMERA_EFFECT #endif -#ifdef ON_FIRE_DISTORT_EFFECT +#if defined ON_FIRE_DISTORT_EFFECT #endif -#ifdef POM_OFFSET_SHADOW_BIAS +#if defined POM_OFFSET_SHADOW_BIAS #endif -#ifdef DEPTH_WRITE_POM +#if defined DEPTH_WRITE_POM #endif -#ifdef ARDACRAFT_HEIGHTMAP +#if defined ARDACRAFT_HEIGHTMAP #endif -#ifdef Snowy_Winter +#if defined Snowy_Winter #endif \ No newline at end of file diff --git a/shaders/world0/gbuffers_skytextured.vsh b/shaders/world0/gbuffers_skytextured.vsh index d6e8b32..055533b 100644 --- a/shaders/world0/gbuffers_skytextured.vsh +++ b/shaders/world0/gbuffers_skytextured.vsh @@ -1,9 +1,9 @@ #version 120 #define ANTIALIASING_RELATED_SETTINGS #include "/lib/settings.glsl" +#include "/lib/res_params.glsl" #if RESOURCEPACK_SKY != 0 - #include "/lib/res_params.glsl" /* !! DO NOT REMOVE !! This code is from Chocapic13' shaders diff --git a/shaders/world0_with_aether_flag/gbuffers_skytextured.vsh b/shaders/world0_with_aether_flag/gbuffers_skytextured.vsh index ae442b3..f31a2f3 100644 --- a/shaders/world0_with_aether_flag/gbuffers_skytextured.vsh +++ b/shaders/world0_with_aether_flag/gbuffers_skytextured.vsh @@ -1,10 +1,10 @@ #version 120 #define ANTIALIASING_RELATED_SETTINGS #include "/lib/settings.glsl" +#include "/lib/res_params.glsl" #if RESOURCEPACK_SKY != 0 - #include "/lib/res_params.glsl" /* !! DO NOT REMOVE !! This code is from Chocapic13' shaders diff --git a/shaders/world0_with_twilight_forest_flag/gbuffers_skytextured.vsh b/shaders/world0_with_twilight_forest_flag/gbuffers_skytextured.vsh index d6e8b32..055533b 100644 --- a/shaders/world0_with_twilight_forest_flag/gbuffers_skytextured.vsh +++ b/shaders/world0_with_twilight_forest_flag/gbuffers_skytextured.vsh @@ -1,9 +1,9 @@ #version 120 #define ANTIALIASING_RELATED_SETTINGS #include "/lib/settings.glsl" +#include "/lib/res_params.glsl" #if RESOURCEPACK_SKY != 0 - #include "/lib/res_params.glsl" /* !! DO NOT REMOVE !! This code is from Chocapic13' shaders