diff --git a/shaders/block.properties b/shaders/block.properties index 8d9c49b..0f92ebf 100644 --- a/shaders/block.properties +++ b/shaders/block.properties @@ -3,8 +3,7 @@ block.2200 = minecraft:oak_sign minecraft:spruce_sign minecraft:birch_sign minecraft:jungle_sign minecraft:acacia_sign minecraft:dark_oak_sign minecraft:mangrove_sign minecraft:crimson_sign minecraft:warped_sign minecraft:oak_wall_sign minecraft:spruce_wall_sign minecraft:birch_wall_sign minecraft:jungle_wall_sign minecraft:acacia_wall_sign minecraft:dark_wall_oak_sign minecraft:mangrove_wall_sign minecraft:crimson_wall_sign minecraft:warped_wall_sign - - + block.2100 = minecraft:end_portal ####### ----- SSS and waving ----- ####### diff --git a/shaders/composite1.fsh b/shaders/composite1.fsh index 22b4c42..acde14c 100644 --- a/shaders/composite1.fsh +++ b/shaders/composite1.fsh @@ -1155,7 +1155,9 @@ void main() { if(lightningBolt) FINAL_COLOR.rgb += vec3(Lightning_R,Lightning_G,Lightning_B) * 255.0; - gl_FragData[0].rgb = FINAL_COLOR; + + + gl_FragData[0].rgb = FINAL_COLOR ; // if(LabSSS > 0.0) gl_FragData[0].rgb = vec3(0,25,0); } diff --git a/shaders/deferred.vsh b/shaders/deferred.vsh index ce60291..3993f18 100644 --- a/shaders/deferred.vsh +++ b/shaders/deferred.vsh @@ -97,6 +97,7 @@ void main() { pos = normalize(vec3(0,1,0)); } + /// TOOO DAMN BLUE // // only need to sample one spot for this // averageSkyCol += 2.0*skyFromTex(normalize(vec3(0.0,1.0,0.0)),colortex4).rgb/150.; diff --git a/shaders/entity.properties b/shaders/entity.properties index fec20b9..80b9152 100644 --- a/shaders/entity.properties +++ b/shaders/entity.properties @@ -8,4 +8,6 @@ entity.1100 = slime giant ender_dragon ghast sheep #weak sss (same as weak sss for blocks) entity.1200 = player 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 elder_gaurdian endermite evoker guardian hoglin husk magma_cube phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager wither trader_llama -entity.12345 = minecraft:lightning_bolt weather2:lightning_bolt \ No newline at end of file +entity.12345 = minecraft:lightning_bolt weather2:lightning_bolt + +entity.2300 = minecraft:item_frame minecraft:item_display \ No newline at end of file diff --git a/shaders/gbuffers_all_solid.fsh b/shaders/gbuffers_all_solid.fsh index d2cb38d..af47805 100644 --- a/shaders/gbuffers_all_solid.fsh +++ b/shaders/gbuffers_all_solid.fsh @@ -396,9 +396,12 @@ void main() { vec3 viewVector = normalize(tbnMatrix*fragpos); float dist = length(fragpos); + float maxdist = MAX_OCCLUSION_DISTANCE; + if(!ifPOM) maxdist = 0.0; + gl_FragDepth = gl_FragCoord.z; - if (dist < MAX_OCCLUSION_DISTANCE) { + if (dist < maxdist) { float depthmap = readNormal(vtexcoord.st).a; float used_POM_DEPTH = 1.0; @@ -448,6 +451,7 @@ void main() { vec4 Albedo = texture2D_POMSwitch(texture, adjustedTexCoord.xy, vec4(dcdx,dcdy), ifPOM) * color; + if(LIGHTNING > 0) Albedo = vec4(1); // float ENDPORTAL_EFFECT = PORTAL > 0 ? EndPortalEffect(Albedo, fragpos, worldpos, tbnMatrix) : 0; #ifdef WhiteWorld @@ -490,6 +494,7 @@ void main() { else Albedo.a = 0.0; #endif + //////////////////////////////// //////////////////////////////// //////////////////////////////// NORMAL //////////////////////////////// //////////////////////////////// //////////////////////////////// diff --git a/shaders/gbuffers_all_solid.vsh b/shaders/gbuffers_all_solid.vsh index 3191cbb..d59b18b 100644 --- a/shaders/gbuffers_all_solid.vsh +++ b/shaders/gbuffers_all_solid.vsh @@ -226,16 +226,17 @@ void main() { if(blockEntityId == 2200) SIGN = 1; if(blockEntityId == 2100) PORTAL = 1; #endif - + NameTags = 0; PHYSICSMOD_SNOW = 0; #ifdef ENTITIES -#ifdef ENTITY_PHYSICSMOD_SNOW - if(entityId == 829925) PHYSICSMOD_SNOW = 1; -#endif + #ifdef ENTITY_PHYSICSMOD_SNOW + if(entityId == 829925) PHYSICSMOD_SNOW = 1; + #endif + if(entityId == 2300) SIGN = 1; // try and single out nametag text and then discard nametag background // if( dot(gl_Color.rgb, vec3(1.0/3.0)) < 1.0) NameTags = 1;