From 80c310611b05483a325fd3a5a0aa82309ae65cc0 Mon Sep 17 00:00:00 2001 From: Xonk Date: Fri, 20 Oct 2023 20:58:33 -0400 Subject: [PATCH] FIX SSS on entities --- shaders/dimensions/all_solid.vsh | 15 +++------------ shaders/entity.properties | 2 +- shaders/shaders.properties | 2 +- shaders/world0/gbuffers_entities.vsh | 2 +- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/shaders/dimensions/all_solid.vsh b/shaders/dimensions/all_solid.vsh index 3f05d44..36c8bb4 100644 --- a/shaders/dimensions/all_solid.vsh +++ b/shaders/dimensions/all_solid.vsh @@ -300,7 +300,6 @@ void main() { if(mc_Entity.x == 10006 || mc_Entity.x == 200) SSSAMOUNT = 0.75; // low - #ifdef MISC_BLOCK_SSS if(mc_Entity.x == 10007 || mc_Entity.x == 10008) SSSAMOUNT = 0.5; // weird SSS on blocks like grass and stuff #endif @@ -350,17 +349,9 @@ void main() { #endif - #ifdef Seasons - #ifdef WORLD - #ifndef BLOCKENTITIES - #ifndef ENTITIES - #ifndef HAND - float blank = 0.0; - YearCycleColor(color.rgb, gl_Color.rgb, blank); - #endif - #endif - #endif - #endif + #if defined Seasons && defined WORLD && !defined ENTITIES && !defined BLOCKENTITIES && !defined HAND + float blank = 0.0; + YearCycleColor(color.rgb, gl_Color.rgb, blank); #endif #ifdef TAA_UPSCALING diff --git a/shaders/entity.properties b/shaders/entity.properties index a3db0ca..f29f666 100644 --- a/shaders/entity.properties +++ b/shaders/entity.properties @@ -8,7 +8,7 @@ entity.1100 = slime giant ghast elder_guardian ## weak sss (same as weak sss for blocks) -entity.1200 = player sheep frog chicken snow_golem polar_bear zombie_horse armor_stand arrow squid bat cat cod cow donkey fox horse mooshroom mule ocelot parrot pig piglin polar_bear pufferfish rabbit salmon strider tropical_fish turtle villager wandering_trader bee cave_spider dolphin enderman llama panda spider wolf zombified_piglin blaze creeper drowned endermite evoker guardian hoglin husk magma_cube phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager trader_llama +entity.1200 = player sheep frog chicken snow_golem polar_bear zombie_horse armor_stand arrow squid bat cat cod cow donkey fox horse mooshroom mule ocelot parrot pig piglin polar_bear pufferfish rabbit salmon strider tropical_fish turtle villager wandering_trader bee cave_spider dolphin enderman llama panda spider wolf zombified_piglin blaze creeper drowned endermite evoker guardian hoglin husk magma_cube phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager trader_llama ## misc stuff entity.1300 = ender_dragon wither diff --git a/shaders/shaders.properties b/shaders/shaders.properties index 74bf6a0..7e9c5e4 100644 --- a/shaders/shaders.properties +++ b/shaders/shaders.properties @@ -56,7 +56,7 @@ blend.composite.colortex12 = off # Alpha test alphaTest.shadow = GREATER 0.1 -alphaTest.gbuffers_entities = GREATER 0.1 +alphaTest.gbuffers_entities = GREATER 0.01 alphaTest.gbuffers_armor_glint=false alphaTest.gbuffers_weather=false diff --git a/shaders/world0/gbuffers_entities.vsh b/shaders/world0/gbuffers_entities.vsh index 330a017..b2f5ab4 100644 --- a/shaders/world0/gbuffers_entities.vsh +++ b/shaders/world0/gbuffers_entities.vsh @@ -1,7 +1,7 @@ #version 120 -// #define WORLD +#define WORLD #define ENTITIES #define OVERWORLD_SHADER