diff --git a/shaders/block.properties b/shaders/block.properties index 032e971..cd72933 100644 --- a/shaders/block.properties +++ b/shaders/block.properties @@ -15,7 +15,8 @@ block.10004 = minecraft:flowering_azalea minecraft:tall_seagrass minecraft:seagrass minecraft:kelp minecraft:large_fern:half=lower minecraft:tall_grass minecraft:tall_seagrass minecraft:kelp_plant minecraft:peony minecraft:rose_bush minecraft:lilac minecraft:sunflower:half=lower minecraft:packed_ice minecraft:blue_ice minecraft:melon_stem minecraft:pumpkin_stem minecraft:attached_melon_stem minecraft:attached_pumpkin_stem minecraft:lily_pad westerosblocks:blackberry_bush westerosblocks:blueberry_bush westerosblocks:raspberry_bush westerosblocks:juniper_bush westerosblocks:red_rose_bush westerosblocks:pink_rose_bush westerosblocks:white_rose_bush westerosblocks:yellow_rose_bush westerosblocks:yellow_wildflowers westerosblocks:green_spiny_herb westerosblocks:green_leafy_herb westerosblocks:orange_marigolds westerosblocks:orange_trollius westerosblocks:blue_forgetmenots westerosblocks:pink_wildflowers westerosblocks:yellow_tansy westerosblocks:blue_flax westerosblocks:white_daisies westerosblocks:yellow_daisies westerosblocks:green_scrub_grass westerosblocks:dead_scrub_grass westerosblocks:yellow_bedstraw westerosblocks:orange_bells westerosblocks:blue_bells westerosblocks:blue_swamp_bells westerosblocks:yellow_buttercups westerosblocks:orange_bog_asphodel westerosblocks:yellow_lupine westerosblocks:blue_hyacinth westerosblocks:pink_thistle westerosblocks:yellow_dandelions westerosblocks:yellow_daffodils westerosblocks:yellow_roses westerosblocks:strawberry_bush westerosblocks:white_lilyofthevalley westerosblocks:yellow_bells westerosblocks:yellow_sunflower westerosblocks:white_roses westerosblocks:red_dark_roses westerosblocks:yellow_hellebore westerosblocks:meadow_fescue westerosblocks:red_poppies westerosblocks:red_roses westerosblocks:purple_pansies westerosblocks:purple_roses westerosblocks:orange_sun_star westerosblocks:pink_primrose westerosblocks:red_aster westerosblocks:blue_chicory westerosblocks:red_flowering_spiny_herb westerosblocks:purple_foxglove westerosblocks:pink_allium westerosblocks:purple_violets westerosblocks:white_chamomile westerosblocks:red_tulips westerosblocks:white_peony westerosblocks:purple_alpine_sowthistle westerosblocks:red_carnations westerosblocks:magenta_roses westerosblocks:red_chrysanthemum westerosblocks:blue_orchid westerosblocks:yellow_rudbeckia westerosblocks:pink_tulips westerosblocks:cranberry_bush westerosblocks:purple_lavender westerosblocks:red_sourleaf_bush westerosblocks:pink_sweet_peas westerosblocks:red_sorrel westerosblocks:pink_roses westerosblocks:unshaded_grass westerosblocks:cow_parsely westerosblocks:bracken westerosblocks:lady_fern westerosblocks:nettle westerosblocks:dead_bracken westerosblocks:fireweed westerosblocks:heather westerosblocks:red_fern westerosblocks:dock_leaf westerosblocks:jasmine_vines westerosblocks:dappled_moss westerosblocks:cushion_moss_wall westerosblocks:hemp_short westerosblocks:hemp_tall westerosblocks:hemp_dense westerosblocks:crop_carrots westerosblocks:crop_wheat westerosblocks:crop_turnips westerosblocks:crop_peas westerosblocks:cattails westerosblocks:jungle_tall_fern westerosblocks:jungle_tall_grass westerosblocks:savanna_tall_grass \ ## weak sss - block.10006 = minecraft:amethyst_block minecraft:budding_amethyst minecraft:small_amethyst_bud minecraft:medium_amethyst_bud minecraft:large_amethyst_bud minecraft:amethyst_cluster minecraft:pitcher_plant minecraft:small_dripleaf minecraft:grass_block:snowy=true minecraft:snow_block minecraft:snow powder_snow 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: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:waterlogged=false minecraft:honeycomb_block + block.10006 = minecraft:amethyst_block minecraft:budding_amethyst minecraft:small_amethyst_bud minecraft:pitcher_plant minecraft:small_dripleaf minecraft:grass_block:snowy=true minecraft:snow_block minecraft:snow powder_snow 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:spore_blossom minecraft:cave_vines:berries=false minecraft:cave_vines_plant:berries=false 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:waterlogged=false minecraft:honeycomb_block + # removed: medium_amethyst_bud large_amethyst_bud amethyst_cluster ## weak sss block.200 = minecraft:white_wool minecraft:orange_wool minecraft:magenta_wool minecraft:light_blue_wool minecraft:yellow_wool minecraft:lime_wool minecraft:pink_wool minecraft:gray_wool minecraft:light_gray_wool minecraft:cyan_wool minecraft:purple_wool minecraft:blue_wool minecraft:brown_wool minecraft:green_wool minecraft:red_wool minecraft:black_wool minecraft:orange_carpet minecraft:magenta_carpet minecraft:light_blue_carpet minecraft:yellow_carpet minecraft:lime_carpet minecraft:pink_carpet minecraft:gray_carpet minecraft:light_gray_carpet minecraft:cyan_carpet minecraft:purple_carpet minecraft:blue_carpet minecraft:brown_carpet minecraft:green_carpet minecraft:red_carpet minecraft:black_carpet westerosblocks:clothesline westerosblocks:smoke westerosblocks:brown_mushroom_1 westerosblocks:brown_mushroom_2 westerosblocks:brown_mushroom_3 westerosblocks:brown_mushroom_4 westerosblocks:brown_mushroom_5 westerosblocks:brown_mushroom_6 westerosblocks:brown_mushroom_7 westerosblocks:brown_mushroom_8 westerosblocks:brown_mushroom_9 westerosblocks:brown_mushroom_10 westerosblocks:brown_mushroom_11 westerosblocks:brown_mushroom_12 westerosblocks:brown_mushroom_13 westerosblocks:red_mushroom_1 westerosblocks:red_mushroom_2 westerosblocks:red_mushroom_3 westerosblocks:red_mushroom_4 westerosblocks:red_mushroom_5 westerosblocks:red_mushroom_6 westerosblocks:red_mushroom_7 westerosblocks:red_mushroom_8 westerosblocks:red_mushroom_9 westerosblocks:white_wool_slab westerosblocks:orange_wool_slab westerosblocks:light_brown_wool_slab westerosblocks:light_blue_wool_slab westerosblocks:yellow_wool_slab westerosblocks:dirty_white_wool_slab westerosblocks:pink_wool_slab westerosblocks:grey_wool_slab westerosblocks:light_grey_wool_slab westerosblocks:cyan_wool_slab westerosblocks:purple_wool_slab westerosblocks:blue_wool_slab westerosblocks:brown_wool_slab westerosblocks:green_wool_slab westerosblocks:red_wool_slab westerosblocks:black_wool_slab westerosblocks:white_wool_carpet westerosblocks:orange_wool_carpet westerosblocks:light_brown_wool_carpet westerosblocks:light_blue_wool_carpet westerosblocks:yellow_wool_carpet westerosblocks:dirty_white_wool_carpet westerosblocks:pink_wool_carpet westerosblocks:grey_wool_carpet westerosblocks:light_grey_wool_carpet westerosblocks:cyan_wool_carpet westerosblocks:purple_wool_carpet westerosblocks:blue_wool_carpet westerosblocks:brown_wool_carpet westerosblocks:green_wool_carpet westerosblocks:red_wool_carpet westerosblocks:black_wool_carpet westerosblocks:thatch_light_fur_carpet westerosblocks:thatch_dark_fur_carpet @@ -30,39 +31,44 @@ block.10008 = minecraft:grass_block:snowy=false ####### ----- lightsources ----- ####### - block.1001 = beacon - block.1002 = candle:candles=1:lit=true black_candle:candles=1:lit=true blue_candle:candles=1:lit=true brown_candle:candles=1:lit=true cyan_candle:candles=1:lit=true gray_candle:candles=1:lit=true green_candle:candles=1:lit=true light_blue_candle:candles=1:lit=true light_gray_candle:candles=1:lit=true lime_candle:candles=1:lit=true magenta_candle:candles=1:lit=true orange_candle:candles=1:lit=true pink_candle:candles=1:lit=true purple_candle:candles=1:lit=true red_candle:candles=1:lit=true white_candle:candles=1:lit=true yellow_candle:candles=1:lit=true - block.1003 = candle:candles=2:lit=true black_candle:candles=2:lit=true blue_candle:candles=2:lit=true brown_candle:candles=2:lit=true cyan_candle:candles=2:lit=true gray_candle:candles=2:lit=true green_candle:candles=2:lit=true light_blue_candle:candles=2:lit=true light_gray_candle:candles=2:lit=true lime_candle:candles=2:lit=true magenta_candle:candles=2:lit=true orange_candle:candles=2:lit=true pink_candle:candles=2:lit=true purple_candle:candles=2:lit=true red_candle:candles=2:lit=true white_candle:candles=2:lit=true yellow_candle:candles=2:lit=true - block.1004 = candle:candles=3:lit=true black_candle:candles=3:lit=true blue_candle:candles=3:lit=true brown_candle:candles=3:lit=true cyan_candle:candles=3:lit=true gray_candle:candles=3:lit=true green_candle:candles=3:lit=true light_blue_candle:candles=3:lit=true light_gray_candle:candles=3:lit=true lime_candle:candles=3:lit=true magenta_candle:candles=3:lit=true orange_candle:candles=3:lit=true pink_candle:candles=3:lit=true purple_candle:candles=3:lit=true red_candle:candles=3:lit=true white_candle:candles=3:lit=true yellow_candle:candles=3:lit=true - block.1005 = candle:candles=4:lit=true black_candle:candles=4:lit=true blue_candle:candles=4:lit=true brown_candle:candles=4:lit=true cyan_candle:candles=4:lit=true gray_candle:candles=4:lit=true green_candle:candles=4:lit=true light_blue_candle:candles=4:lit=true light_gray_candle:candles=4:lit=true lime_candle:candles=4:lit=true magenta_candle:candles=4:lit=true orange_candle:candles=4:lit=true pink_candle:candles=4:lit=true purple_candle:candles=4:lit=true red_candle:candles=4:lit=true white_candle:candles=4:lit=true yellow_candle:candles=4:lit=true - block.1006 = cave_vines_plant:berries=true cave_vines:berries=true - block.1007 = conduit - block.1008 = end_gateway - block.1009 = end_rod - block.1010 = fire campfire:lit=true - block.1011 = ochre_froglight - block.1012 = pearlescent_froglight - block.1013 = verdant_froglight - block.1014 = glowstone - block.1015 = jack_o_lantern - block.1016 = lantern - block.1017 = lava - block.1018 = magma_block - block.1019 = redstone_lamp:lit=true - block.1020 = redstone_torch:lit=true redstone_wall_torch:lit=true - block.1021 = respawn_anchor:charges=4 - block.1022 = sculk_sensor:sculk_sensor_phase=active - block.1023 = sea_pickle:waterlogged=true:pickles=1 - block.1024 = sea_pickle:waterlogged=true:pickles=2 - block.1025 = sea_pickle:waterlogged=true:pickles=3 - block.1026 = sea_pickle:waterlogged=true:pickles=4 - block.1027 = sea_lantern - block.1028 = shroomlight - block.1029 = smoker:lit=true - block.1030 = soul_fire soul_campfire:lit=true - block.1031 = soul_lantern - block.1032 = soul_torch soul_wall_torch - block.1033 = torch wall_torch + block.1001 = large_amethyst_bud + block.1002 = medium_amethyst_bud + block.1003 = amethyst_cluster + block.1004 = beacon + block.1005 = candle:candles=1:lit=true black_candle:candles=1:lit=true blue_candle:candles=1:lit=true brown_candle:candles=1:lit=true cyan_candle:candles=1:lit=true gray_candle:candles=1:lit=true green_candle:candles=1:lit=true light_blue_candle:candles=1:lit=true light_gray_candle:candles=1:lit=true lime_candle:candles=1:lit=true magenta_candle:candles=1:lit=true orange_candle:candles=1:lit=true pink_candle:candles=1:lit=true purple_candle:candles=1:lit=true red_candle:candles=1:lit=true white_candle:candles=1:lit=true yellow_candle:candles=1:lit=true + block.1006 = candle:candles=2:lit=true black_candle:candles=2:lit=true blue_candle:candles=2:lit=true brown_candle:candles=2:lit=true cyan_candle:candles=2:lit=true gray_candle:candles=2:lit=true green_candle:candles=2:lit=true light_blue_candle:candles=2:lit=true light_gray_candle:candles=2:lit=true lime_candle:candles=2:lit=true magenta_candle:candles=2:lit=true orange_candle:candles=2:lit=true pink_candle:candles=2:lit=true purple_candle:candles=2:lit=true red_candle:candles=2:lit=true white_candle:candles=2:lit=true yellow_candle:candles=2:lit=true + block.1007 = candle:candles=3:lit=true black_candle:candles=3:lit=true blue_candle:candles=3:lit=true brown_candle:candles=3:lit=true cyan_candle:candles=3:lit=true gray_candle:candles=3:lit=true green_candle:candles=3:lit=true light_blue_candle:candles=3:lit=true light_gray_candle:candles=3:lit=true lime_candle:candles=3:lit=true magenta_candle:candles=3:lit=true orange_candle:candles=3:lit=true pink_candle:candles=3:lit=true purple_candle:candles=3:lit=true red_candle:candles=3:lit=true white_candle:candles=3:lit=true yellow_candle:candles=3:lit=true + block.1008 = candle:candles=4:lit=true black_candle:candles=4:lit=true blue_candle:candles=4:lit=true brown_candle:candles=4:lit=true cyan_candle:candles=4:lit=true gray_candle:candles=4:lit=true green_candle:candles=4:lit=true light_blue_candle:candles=4:lit=true light_gray_candle:candles=4:lit=true lime_candle:candles=4:lit=true magenta_candle:candles=4:lit=true orange_candle:candles=4:lit=true pink_candle:candles=4:lit=true purple_candle:candles=4:lit=true red_candle:candles=4:lit=true white_candle:candles=4:lit=true yellow_candle:candles=4:lit=true + block.1009 = cave_vines_plant:berries=true cave_vines:berries=true + block.1010 = conduit + block.1011 = crying_obsidian + block.1012 = end_gateway + block.1013 = end_rod + block.1014 = fire campfire:lit=true + block.1015 = ochre_froglight + block.1016 = pearlescent_froglight + block.1017 = verdant_froglight + block.1018 = glow_lichen + block.1019 = glowstone + block.1020 = jack_o_lantern + block.1021 = lantern + block.1022 = lava + block.1023 = magma_block + block.1024 = redstone_lamp:lit=true + block.1025 = redstone_torch:lit=true redstone_wall_torch:lit=true + block.1026 = respawn_anchor:charges=4 + block.1027 = sculk_sensor:sculk_sensor_phase=active + block.1028 = sea_pickle:waterlogged=true:pickles=1 + block.1029 = sea_pickle:waterlogged=true:pickles=2 + block.1030 = sea_pickle:waterlogged=true:pickles=3 + block.1031 = sea_pickle:waterlogged=true:pickles=4 + block.1032 = sea_lantern + block.1033 = shroomlight + block.1034 = smoker:lit=true + block.1035 = soul_fire soul_campfire:lit=true + block.1036 = soul_lantern + block.1037 = soul_torch soul_wall_torch + block.1038 = torch wall_torch block.1100 = westerosblocks:safe_fire block.1101 = conquest:white_paper_lantern conquest:yellow_paper_lantern conquest:small_red_paper_lantern conquest:chinese_palace_lantern conquest:campfire conquest:brazier conquest:hanging_brazier conquest:chandelier conquest:candelabra conquest:cross_chandelier conquest:iron_candelabrum_1 conquest:golden_candelabrum_1 conquest:candle conquest:hanging_candle_holder conquest:candle_in_a_lantern conquest:candles conquest:hand_candle conquest:torch_with_grille conquest:elven_hand_light conquest:ship_lantern conquest:victorian_lantern conquest:small_lantern conquest:big_lantern conquest:hanging_oil_lamp conquest:oil_lamp conquest:terracotta_oil_lamp conquest:invisible_light_low conquest:invisible_light_medium conquest:invisible_light diff --git a/shaders/dimensions/composite1.fsh b/shaders/dimensions/composite1.fsh index 47a61b9..af38633 100644 --- a/shaders/dimensions/composite1.fsh +++ b/shaders/dimensions/composite1.fsh @@ -1268,8 +1268,13 @@ void main() { #endif #ifdef IS_LPV_ENABLED - // vec3 lpvPos = GetLpvPosition(feetPlayerPos) + 0.5*viewToWorld(FlatNormals); - vec3 lpvPos = GetLpvPosition(feetPlayerPos) - 0.5*viewToWorld(FlatNormals) + slopednormal; + vec3 lpvPos = GetLpvPosition(feetPlayerPos); + + #ifdef LPV_NORMAL_OFFSET + lpvPos += -0.5*viewToWorld(FlatNormals) + slopednormal; + #else + lpvPos += 0.5*viewToWorld(FlatNormals); + #endif #else const vec3 lpvPos = vec3(0.0); #endif diff --git a/shaders/dimensions/setup.csh b/shaders/dimensions/setup.csh index c9f5ca5..f1efa1d 100644 --- a/shaders/dimensions/setup.csh +++ b/shaders/dimensions/setup.csh @@ -6,6 +6,7 @@ const ivec3 workGroups = ivec3(4, 5, 1); #include "/lib/blocks.glsl" #include "/lib/lpv_blocks.glsl" + const vec3 LightColor_Amethyst = vec3(0.464, 0.227, 0.788); const vec3 LightColor_Candles = vec3(1.0, 0.4, 0.1); const vec3 LightColor_SeaPickle = vec3(0.283, 0.394, 0.212); @@ -27,6 +28,21 @@ void main() { vec3 tintColor = vec3(1.0); switch (blockId) { + case BLOCK_AMETHYST_BUD_LARGE: + lightColor = LightColor_Amethyst; + lightRange = 4.0; + mixWeight = 0.6; + break; + case BLOCK_AMETHYST_BUD_MEDIUM: + lightColor = LightColor_Amethyst; + lightRange = 2.0; + mixWeight = 0.8; + break; + case BLOCK_AMETHYST_CLUSTER: + lightColor = LightColor_Amethyst; + lightRange = 5.0; + mixWeight = 0.4; + break; case BLOCK_BEACON: lightColor = vec3(1.0); lightRange = 15.0; @@ -52,7 +68,7 @@ void main() { mixWeight = 1.0; break; case BLOCK_CAVE_VINE_BERRIES: - lightColor = vec3(0.717, 0.541, 0.188); + lightColor = vec3(0.651, 0.369, 0.157); lightRange = 14.0; mixWeight = 1.0; break; @@ -60,6 +76,10 @@ void main() { lightColor = vec3(1.0); lightRange = 15.0; break; + case BLOCK_CRYING_OBSIDIAN: + lightColor = vec3(0.390, 0.065, 0.646); + lightRange = 10.0; + break; case BLOCK_END_GATEWAY: lightColor = vec3(1.0); lightRange = 15.0; @@ -85,21 +105,25 @@ void main() { lightColor = vec3(0.463, 0.763, 0.409); lightRange = 15.0; break; + case BLOCK_GLOW_LICHEN: + lightColor = vec3(0.092, 0.217, 0.126); + lightRange = 7.0; + break; case BLOCK_GLOWSTONE: lightColor = vec3(0.747, 0.594, 0.326); lightRange = 15.0; break; case BLOCK_JACK_O_LANTERN: - lightColor = vec3(1.0, 0.7, 0.1); + lightColor = vec3(0.864, 0.598, 0.348); lightRange = 15.0; break; case BLOCK_LANTERN: - lightColor = vec3(1.0, 0.7, 0.1); + lightColor = vec3(0.839, 0.541, 0.2); lightRange = 15.0; mixWeight = 0.8; break; case BLOCK_LAVA: - lightColor = vec3(0.804, 0.424, 0.149); + lightColor = vec3(0.659, 0.302, 0.106); lightRange = 15.0; break; case BLOCK_MAGMA: @@ -304,6 +328,8 @@ void main() { break; } + if (lightRange > 0.0) lightRange += 1.0; + LpvBlockData block; block.ColorRange = packUnorm4x8(vec4(lightColor, lightRange/255.0)); block.MaskWeight = BuildBlockLpvData(mixMask, mixWeight); diff --git a/shaders/lib/blocks.glsl b/shaders/lib/blocks.glsl index b38013f..0b34d97 100644 --- a/shaders/lib/blocks.glsl +++ b/shaders/lib/blocks.glsl @@ -2,39 +2,44 @@ #define BLOCK_WATER 8 -#define BLOCK_BEACON 1001 -#define BLOCK_CANDLES_LIT_1 1002 -#define BLOCK_CANDLES_LIT_2 1003 -#define BLOCK_CANDLES_LIT_3 1004 -#define BLOCK_CANDLES_LIT_4 1005 -#define BLOCK_CAVE_VINE_BERRIES 1006 -#define BLOCK_CONDUIT 1007 -#define BLOCK_END_GATEWAY 1008 -#define BLOCK_END_ROD 1009 -#define BLOCK_FIRE 1010 -#define BLOCK_FROGLIGHT_OCHRE 1011 -#define BLOCK_FROGLIGHT_PEARLESCENT 1012 -#define BLOCK_FROGLIGHT_VERDANT 1013 -#define BLOCK_GLOWSTONE 1014 -#define BLOCK_JACK_O_LANTERN 1015 -#define BLOCK_LANTERN 1016 -#define BLOCK_LAVA 1017 -#define BLOCK_MAGMA 1018 -#define BLOCK_REDSTONE_LAMP_LIT 1019 -#define BLOCK_REDSTONE_TORCH_LIT 1020 -#define BLOCK_RESPAWN_ANCHOR_4 1021 -#define BLOCK_SCULK_SENSOR_ACTIVE 1022 -#define BLOCK_SEA_PICKLE_WET_1 1023 -#define BLOCK_SEA_PICKLE_WET_2 1024 -#define BLOCK_SEA_PICKLE_WET_3 1025 -#define BLOCK_SEA_PICKLE_WET_4 1026 -#define BLOCK_SEA_LANTERN 1027 -#define BLOCK_SHROOMLIGHT 1028 -#define BLOCK_SMOKER_LIT 1029 -#define BLOCK_SOUL_FIRE 1030 -#define BLOCK_SOUL_LANTERN 1031 -#define BLOCK_SOUL_TORCH 1032 -#define BLOCK_TORCH 1033 +#define BLOCK_AMETHYST_BUD_LARGE 1001 +#define BLOCK_AMETHYST_BUD_MEDIUM 1002 +#define BLOCK_AMETHYST_CLUSTER 1003 +#define BLOCK_BEACON 1004 +#define BLOCK_CANDLES_LIT_1 1005 +#define BLOCK_CANDLES_LIT_2 1006 +#define BLOCK_CANDLES_LIT_3 1007 +#define BLOCK_CANDLES_LIT_4 1008 +#define BLOCK_CAVE_VINE_BERRIES 1009 +#define BLOCK_CONDUIT 1010 +#define BLOCK_CRYING_OBSIDIAN 1011 +#define BLOCK_END_GATEWAY 1012 +#define BLOCK_END_ROD 1013 +#define BLOCK_FIRE 1014 +#define BLOCK_FROGLIGHT_OCHRE 1015 +#define BLOCK_FROGLIGHT_PEARLESCENT 1016 +#define BLOCK_FROGLIGHT_VERDANT 1017 +#define BLOCK_GLOW_LICHEN 1018 +#define BLOCK_GLOWSTONE 1019 +#define BLOCK_JACK_O_LANTERN 1020 +#define BLOCK_LANTERN 1021 +#define BLOCK_LAVA 1022 +#define BLOCK_MAGMA 1023 +#define BLOCK_REDSTONE_LAMP_LIT 1024 +#define BLOCK_REDSTONE_TORCH_LIT 1025 +#define BLOCK_RESPAWN_ANCHOR_4 1026 +#define BLOCK_SCULK_SENSOR_ACTIVE 1027 +#define BLOCK_SEA_PICKLE_WET_1 1028 +#define BLOCK_SEA_PICKLE_WET_2 1029 +#define BLOCK_SEA_PICKLE_WET_3 1030 +#define BLOCK_SEA_PICKLE_WET_4 1031 +#define BLOCK_SEA_LANTERN 1032 +#define BLOCK_SHROOMLIGHT 1033 +#define BLOCK_SMOKER_LIT 1034 +#define BLOCK_SOUL_FIRE 1035 +#define BLOCK_SOUL_LANTERN 1036 +#define BLOCK_SOUL_TORCH 1037 +#define BLOCK_TORCH 1038 #define BLOCK_GLASS 1201 #define BLOCK_HONEY 1202 diff --git a/shaders/lib/lpv_render.glsl b/shaders/lib/lpv_render.glsl index 25a3bec..24cba98 100644 --- a/shaders/lib/lpv_render.glsl +++ b/shaders/lib/lpv_render.glsl @@ -1,8 +1,8 @@ // LPV falloff curve -const float LpvBlockPower = 4.0; +const float LpvBlockPower = 5.0; // LPV block brightness scale -const float LpvBlockBrightness = 3.0; +const float LpvBlockBrightness = 2.0; vec4 SampleLpvNearest(const in ivec3 lpvPos) { diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index bdc833c..6b21ec9 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -674,6 +674,7 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631) /////////////////////////////////////////// //#define LPV_ENABLED +#define LPV_NORMAL_OFFSET #define LPV_SIZE 7 // [6 7 8] #ifdef LPV_ENABLED diff --git a/shaders/shaders.properties b/shaders/shaders.properties index c6410b2..c946035 100644 --- a/shaders/shaders.properties +++ b/shaders/shaders.properties @@ -19,7 +19,7 @@ iris.features.optional=ENTITY_TRANSLUCENT REVERSED_CULLING COMPUTE_SHADERS CUSTO #endif #ifdef LPV_ENABLED - shadow.enabled = true + # shadow.enabled = true shadow.culling = reversed #endif