From ab7403954e69ec7064c4ce24a13d8599c4470cf8 Mon Sep 17 00:00:00 2001 From: Joshua Miller Date: Mon, 10 Jun 2024 21:35:39 -0400 Subject: [PATCH 1/2] Update settings.glsl Re-enable Iris shadow hack for floodfill, fix is not released yet. --- shaders/lib/settings.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index 873b314..8710402 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -725,7 +725,7 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631) //#define LPV_COLORED_CANDLES // Fix for making nether/end work until next Iris release to fix shadow matrices -//#define LPV_NOSHADOW_HACK +#define LPV_NOSHADOW_HACK #ifdef LPV_ENABLED #ifdef IRIS_FEATURE_CUSTOM_IMAGES @@ -784,4 +784,4 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631) #ifdef PARTICLE_RENDERING_FIX #endif #ifdef RENDER_PLAYER_SHADOWS -#endif \ No newline at end of file +#endif From de987d9aebe9d40e2ead080b3a5b649d922ab041 Mon Sep 17 00:00:00 2001 From: NULL511 Date: Mon, 10 Jun 2024 22:58:31 -0400 Subject: [PATCH 2/2] fix reverse culling voxel distance --- shaders/lang/en_us.lang | 2 ++ shaders/lib/settings.glsl | 2 ++ shaders/lib/voxel_common.glsl | 2 -- shaders/shaders.properties | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang index 6b29be6..a86adcd 100644 --- a/shaders/lang/en_us.lang +++ b/shaders/lang/en_us.lang @@ -106,6 +106,7 @@ screen.Direct_Light = Direct Light option.LPV_ENTITY_LIGHTS = Entity Lights option.LPV_REDSTONE_LIGHTS = Redstone Lights option.LPV_COLORED_CANDLES = Colored Candles + option.LPV_NOSHADOW_HACK = Iris <= 1.7.0 Fix screen.Subsurface_Scattering = Sub-Surface Scattering option.LabSSS_Curve = LabSSS Curve @@ -547,6 +548,7 @@ screen.Ambient_light.comment = Configure settings related to the lighting in sha option.LPV_ENTITY_LIGHTS.comment = Allows entities to contribute to colored lighting. option.LPV_REDSTONE_LIGHTS.comment = Allows redstone blocks to contribute to colored lighting. option.LPV_COLORED_CANDLES.comment = Allows colored candles to emit matching colored lighting. + option.LPV_NOSHADOW_HACK.comment = Fix for Iris 1.7.0 and lower! Allows floodfill to work in Nether & End, but disables entity & dropped item lights. screen.Resource_Pack_Support.comment = A handfull of effects that use information provided by a resourcepack. screen.Reflections.comment = Configure the reflections that use information provided by a LabPBR resourcepack. diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index 8710402..4ee2d71 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -730,6 +730,8 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631) #ifdef LPV_ENABLED #ifdef IRIS_FEATURE_CUSTOM_IMAGES #define IS_LPV_ENABLED + + const float voxelDistance = 64.0; #endif #endif diff --git a/shaders/lib/voxel_common.glsl b/shaders/lib/voxel_common.glsl index f548bc7..4c00eb7 100644 --- a/shaders/lib/voxel_common.glsl +++ b/shaders/lib/voxel_common.glsl @@ -7,6 +7,4 @@ const uint VoxelSize = uint(exp2(LPV_SIZE)); const uvec3 VoxelSize3 = uvec3(VoxelSize); -const float voxelDistance = 64.0; - #define BLOCK_EMPTY 0 diff --git a/shaders/shaders.properties b/shaders/shaders.properties index a82d16a..86a10fd 100644 --- a/shaders/shaders.properties +++ b/shaders/shaders.properties @@ -185,8 +185,8 @@ BLISS_SHADERS \ ### FloodFill screen.LPV.columns = 1 - screen.LPV = LPV_ENABLED LPV_SIZE LPV_SATURATION LPV_NORMAL_STRENGTH LPV_ENTITY_LIGHTS LPV_REDSTONE_LIGHTS LPV_COLORED_CANDLES - + screen.LPV = LPV_ENABLED LPV_SIZE LPV_SATURATION LPV_NORMAL_STRENGTH LPV_ENTITY_LIGHTS LPV_REDSTONE_LIGHTS LPV_COLORED_CANDLES LPV_NOSHADOW_HACK + ######## WORLD screen.World.columns=1 screen.World = [Water] [Waving_Stuff] [Sky_coefficients] SKY_GROUND AEROCHROME_MODE AEROCHROME_PINKNESS AEROCHROME_WOOL_ENABLED