From 8d80bb6d6c0c2a2f72c89ddc2947f9cfa14bdd50 Mon Sep 17 00:00:00 2001 From: NULL511 Date: Fri, 3 May 2024 14:53:31 -0400 Subject: [PATCH] misc fixes; add lang --- shaders/dimensions/all_solid.vsh | 4 ++-- shaders/lang/en_us.lang | 8 ++++++++ shaders/lib/blocks.glsl | 3 +++ shaders/shaders.properties | 6 +++++- shaders/world0/shadow.vsh | 2 +- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/shaders/dimensions/all_solid.vsh b/shaders/dimensions/all_solid.vsh index 65b3b61..f4bdebf 100644 --- a/shaders/dimensions/all_solid.vsh +++ b/shaders/dimensions/all_solid.vsh @@ -238,9 +238,9 @@ void main() { #ifdef WORLD // disallow POM to work on signs. - if(blockEntityId == 2200) SIGN = 1; + if(blockEntityId == BLOCK_NO_POM) SIGN = 1; - if(blockEntityId == 2100) PORTAL = 1; + if(blockEntityId == BLOCK_END_PORTAL) PORTAL = 1; #endif NameTags = 0; diff --git a/shaders/lang/en_us.lang b/shaders/lang/en_us.lang index 9b985c4..3d37fb8 100644 --- a/shaders/lang/en_us.lang +++ b/shaders/lang/en_us.lang @@ -72,6 +72,14 @@ screen.Direct_Light = Direct Light option.Max_Shadow_Filter_Radius = Maximum Shadow Filter Radius option.Max_Filter_Depth = Sun Size Factor + screen.LPV = FloodFill + option.LPV_ENABLED = Enabled + option.LPV_SIZE = Size + value.LPV_SIZE.6 = Small [64] + value.LPV_SIZE.7 = Medium [128] + value.LPV_SIZE.8 = Large [256] + option.LPV_NORMAL_OFFSET = Normal-Offset + screen.Subsurface_Scattering = Sub-Surface Scattering option.LabSSS_Curve = LabSSS Curve diff --git a/shaders/lib/blocks.glsl b/shaders/lib/blocks.glsl index 5b2ff79..ac84156 100644 --- a/shaders/lib/blocks.glsl +++ b/shaders/lib/blocks.glsl @@ -79,3 +79,6 @@ #define BLOCK_TRAPDOOR_E 1231 #define BLOCK_TRAPDOOR_S 1232 #define BLOCK_TRAPDOOR_W 1233 +#define BLOCK_END_PORTAL 2100 +#define BLOCK_NO_POM 2200 +#define BLOCK_REDSTONE_WIRE 3000 diff --git a/shaders/shaders.properties b/shaders/shaders.properties index 44762ee..a230b53 100644 --- a/shaders/shaders.properties +++ b/shaders/shaders.properties @@ -125,7 +125,7 @@ BLISS_SHADERS \ ######## LIGHTING ### DIRECT LIGHT screen.Direct_Light.columns=1 - screen.Direct_Light = TRANSLUCENT_COLORED_SHADOWS [Shadows] [Subsurface_Scattering] [Sun_and_Moon_Colors] OLD_LIGHTLEAK_FIX sunPathRotation sun_illuminance MOONPHASE_BASED_MOONLIGHT moon_illuminance LPV_ENABLED + screen.Direct_Light = TRANSLUCENT_COLORED_SHADOWS [Shadows] [Subsurface_Scattering] [Sun_and_Moon_Colors] OLD_LIGHTLEAK_FIX sunPathRotation sun_illuminance MOONPHASE_BASED_MOONLIGHT moon_illuminance [LPV] screen.Shadows.columns=1 screen.Shadows = SCREENSPACE_CONTACT_SHADOWS RENDER_ENTITY_SHADOWS entityShadowDistanceMul [Filtering] shadowMapResolution shadowDistance shadowDistanceRenderMul @@ -165,6 +165,10 @@ BLISS_SHADERS \ screen.Porosity.columns = 1 screen.Porosity = Porosity Puddles Puddle_Size + ### FloodFill + screen.LPV.columns = 1 + screen.LPV = LPV_ENABLED LPV_SIZE LPV_NORMAL_OFFSET + ######## WORLD screen.World.columns=1 screen.World = [Water] [Waving_Stuff] [LabPBR] SKY_GROUND RESOURCEPACK_SKY AEROCHROME_MODE AEROCHROME_PINKNESS AEROCHROME_WOOL_ENABLED diff --git a/shaders/world0/shadow.vsh b/shaders/world0/shadow.vsh index 89fa008..f5c8880 100644 --- a/shaders/world0/shadow.vsh +++ b/shaders/world0/shadow.vsh @@ -140,7 +140,7 @@ void main() { // position = gl_Vertex.xyz; - // if((renderStage == 10 || renderStage == 12) && mc_Entity.x != 3000) { + // if((renderStage == 10 || renderStage == 12) && mc_Entity.x != BLOCK_REDSTONE_WIRE) { // position = (shadowModelViewInverse * vec4(gl_Vertex.xyz,1.0)).xyz; // }