From de21572911266915cce22d3a6c81172a06301eea Mon Sep 17 00:00:00 2001 From: Xonk Date: Thu, 22 Jun 2023 17:51:13 -0400 Subject: [PATCH] add some blocks to waving stuff --- shaders/block.properties | 4 ++-- shaders/composite1.fsh | 4 ++-- shaders/lib/climate_settings.glsl | 2 +- shaders/lib/specular.glsl | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/shaders/block.properties b/shaders/block.properties index 7bae3eb..4842213 100644 --- a/shaders/block.properties +++ b/shaders/block.properties @@ -7,12 +7,12 @@ block.10001 = minecraft:beetroots minecraft:potatoes minecraft:carrots minecraft:wheat minecraft:nether_wart minecraft:kelp minecraft:large_fern:half=upper minecraft:peony:half=upper minecraft:rose_bush:half=upper minecraft:lilac:half=upper minecraft:crimson_roots minecraft:nether_sprouts minecraft:warped_roots minecraft:seagrass minecraft:tall_seagrass:half=upper minecraft:sunflower:half=upper minecraft:tall_grass:half=upper minecraft:wither_rose minecraft:lily_of_the_valley minecraft:cornflower minecraft:sweet_berry_bush minecraft:oxeye_daisy minecraft:pink_tulip minecraft:white_tulip minecraft:orange_tulip minecraft:red_tulip minecraft:azure_bluet minecraft:allium minecraft:blue_orchid minecraft:poppy minecraft:dandelion minecraft:grass minecraft:dead_bush minecraft:oak_sapling minecraft:spruce_sapling minecraft:birch_sapling minecraft:jungle_sapling minecraft:acacia_sapling minecraft:dark_oak_sapling minecraft:fern ##air waving - block.10003 = minecraft:cherry_leaves minecraft:mangrove_leaves minecraft:vine minecraft:oak_leaves minecraft:spruce_leaves minecraft:birch_leaves minecraft:jungle_leaves minecraft:acacia_leaves minecraft:dark_oak_leaves + block.10003 =minecraft:azalea_leaves minecraft:flowering_azalea_leaves minecraft:cherry_leaves minecraft:mangrove_leaves minecraft:vine minecraft:oak_leaves minecraft:spruce_leaves minecraft:birch_leaves minecraft:jungle_leaves minecraft:acacia_leaves minecraft:dark_oak_leaves ####### ----- SSS ----- ####### ## strong - block.10004 = minecraft:fern minecraft:packed_ice minecraft:blue_ice minecraft:melon_stem minecraft:pumpkin_stem minecraft:attached_melon_stem minecraft:attached_pumpkin_stem minecraft:lily_pad minecraft:azalea_leaves minecraft:flowering_azalea_leaves minecraft:azalea minecraft:flowering_azalea + block.10004 = minecraft:fern minecraft:packed_ice minecraft:blue_ice minecraft:melon_stem minecraft:pumpkin_stem minecraft:attached_melon_stem minecraft:attached_pumpkin_stem minecraft:lily_pad ## weak block.10006 = cobweb red_mushroom_block brown_mushroom_block weeping_vines weeping_vines_plant twisting_vines twisting_vines_plant vine tube_coral tube_coral_block tube_coral_fan tube_coral_wall_fan horn_coral horn_coral_block horn_coral_fan horn_coral_wall_fan fire_coral fire_coral_block fire_coral_fan fire_coral_wall_fan dead_brain_coral dead_brain_coral_block dead_brain_coral_fan dead_brain_coral_wall_fan dead_bubble_coral dead_bubble_coral_block dead_bubble_coral_fan dead_bubble_coral_wall_fan dead_bush dead_fire_coral dead_fire_coral_block dead_fire_coral_fan dead_fire_coral_wall_fan dead_horn_coral dead_horn_coral_block dead_horn_coral_fan dead_horn_coral_wall_fan dead_tube_coral dead_tube_coral_block dead_tube_coral_fan dead_tube_coral_wall_fan bubble_coral bubble_coral_block bubble_coral_fan bubble_coral_wall_fan brain_coral brain_coral_block brain_coral_fan brain_coral_wall_fan bamboo bamboo_sapling minecraft:tall_seagrass minecraft:seagrass minecraft:kelp minecraft:large_fern minecraft:tall_grass minecraft:tall_seagrass minecraft:kelp_plant minecraft:peony minecraft:rose_bush minecraft:lilac minecraft:sunflower minecraft:spore_blossom minecraft:cave_vines minecraft:cave_vines_plant minecraft:glow_lichen minecraft:melon minecraft:pumpkin minecraft:big_dripleaf minecraft:big_dripleaf_stem minecraft:cactus minecraft:hay_block minecraft:brown_mushroom minecraft:mushroom_stem minecraft:sugar_cane minecraft:crimson_fungus minecraft:warped_fungus minecraft:sea_pickle minecraft:honeycomb_block diff --git a/shaders/composite1.fsh b/shaders/composite1.fsh index 11998b1..01d127d 100644 --- a/shaders/composite1.fsh +++ b/shaders/composite1.fsh @@ -1094,8 +1094,8 @@ void main() { snow_p3 /= 75.0; - float resolution = 1000.; - snow_p3 = (fract(snow_p3 * resolution) / resolution) - snow_p3; + // float resolution = 1000.; + // snow_p3 = (fract(snow_p3 * resolution) / resolution) - snow_p3; float SnowPatches = texture2D(noisetex, snow_p3.xz).r; // float SnowPatches = densityAtPosSNOW(snow_p3); diff --git a/shaders/lib/climate_settings.glsl b/shaders/lib/climate_settings.glsl index 742bdac..59c29bb 100644 --- a/shaders/lib/climate_settings.glsl +++ b/shaders/lib/climate_settings.glsl @@ -85,7 +85,7 @@ // this is to make snow only exist in winter float FallToWinter_snowfall = mix(0.0, 1.0, AutumnTime); float WinterToSpring_snowfall = mix(FallToWinter_snowfall, 0.0, WinterTime); - SnowySeason = pow(WinterToSpring_snowfall,10.0); + SnowySeason = clamp(pow(sin(WinterToSpring_snowfall*SeasonLength)*0.5+0.5,5),0,1) * WinterToSpring_snowfall; #else SnowySeason = 0.0; #endif diff --git a/shaders/lib/specular.glsl b/shaders/lib/specular.glsl index cd78b45..70c2d1a 100644 --- a/shaders/lib/specular.glsl +++ b/shaders/lib/specular.glsl @@ -286,12 +286,12 @@ void MaterialReflections( #ifdef Screen_Space_Reflections float rayQuality = mix_float(reflection_quality,6.0,rayContribLuma); // Scale quality with ray contribution - + if(hand) {rayQuality = max(rayQuality,30.0); noise.b = 0.5 + (noise.b-0.5);} + vec3 rtPos = rayTraceSpeculars(mat3(gbufferModelView) * L, fragpos.xyz, noise.b, rayQuality, hand, reflectLength); float LOD = clamp(reflectLength * 6.0, 0.0,6.0); - // LOD = 0.0; - if(hand || isEntities) LOD = 6.0; + if(hand || isEntities) LOD = VisibilityFactor*6; if (rtPos.z < 1.) { // Reproject on previous frame vec3 previousPosition = mat3(gbufferModelViewInverse) * toScreenSpace(rtPos) + gbufferModelViewInverse[3].xyz + cameraPosition-previousCameraPosition;