Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2024-12-23 01:59:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

more lpv block mappings

Browse Source
This commit is contained in:
NULL511 2024-05-04 00:20:10 -04:00
parent f88b84defa
commit 43fe9e654a
4 changed files with 191 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
shaders/block.properties
View File

@ -107,72 +107,102 @@ block.127=lantern
block.128=lava block.128=lava
block.129=magma_block block.129=light:level=1
block.130=redstone_lamp:lit=true block.130=light:level=2
block.131=redstone_torch:lit=true redstone_wall_torch:lit=true block.131=light:level=3
block.132=redstone_wire:power=1 block.132=light:level=4
block.133=redstone_wire:power=2 block.133=light:level=5
block.134=redstone_wire:power=3 block.134=light:level=6
block.135=redstone_wire:power=4 block.135=light:level=7
block.136=redstone_wire:power=5 block.136=light:level=8
block.137=redstone_wire:power=6 block.137=light:level=9
block.138=redstone_wire:power=7 block.138=light:level=10
block.139=redstone_wire:power=8 block.139=light:level=11
block.140=redstone_wire:power=9 block.140=light:level=12
block.141=redstone_wire:power=10 block.141=light:level=13
block.142=redstone_wire:power=11 block.142=light:level=14
block.143=redstone_wire:power=12 block.143=light:level=15
block.144=redstone_wire:power=13 block.144=magma_block
block.145=redstone_wire:power=14 block.145=redstone_lamp:lit=true
block.146=redstone_wire:power=15 block.146=redstone_torch:lit=true redstone_wall_torch:lit=true
block.147=repeater:powered=true block.147=redstone_wire:power=1
block.148=respawn_anchor:charges=4 block.148=redstone_wire:power=2
block.149=sculk_sensor:sculk_sensor_phase=active block.149=redstone_wire:power=3
block.150=sea_pickle:waterlogged=true:pickles=1 block.150=redstone_wire:power=4
block.151=sea_pickle:waterlogged=true:pickles=2 block.151=redstone_wire:power=5
block.152=sea_pickle:waterlogged=true:pickles=3 block.152=redstone_wire:power=6
block.153=sea_pickle:waterlogged=true:pickles=4 block.153=redstone_wire:power=7
block.154=sea_lantern block.154=redstone_wire:power=8
block.155=shroomlight block.155=redstone_wire:power=9
block.156=smoker:lit=true block.156=redstone_wire:power=10
block.157=soul_fire soul_campfire:lit=true block.157=redstone_wire:power=11
block.158=soul_lantern block.158=redstone_wire:power=12
block.159=soul_torch soul_wall_torch block.159=redstone_wire:power=13
block.160=torch wall_torch block.160=redstone_wire:power=14
block.161=westerosblocks:safe_fire block.161=redstone_wire:power=15
block.162=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
block.162=repeater:powered=true
block.163=respawn_anchor:charges=4
block.164=sculk_sensor:sculk_sensor_phase=active
block.165=sea_pickle:waterlogged=true:pickles=1
block.166=sea_pickle:waterlogged=true:pickles=2
block.167=sea_pickle:waterlogged=true:pickles=3
block.168=sea_pickle:waterlogged=true:pickles=4
block.169=sea_lantern
block.170=shroomlight
block.171=smoker:lit=true
block.172=soul_fire soul_campfire:lit=true
block.173=soul_lantern
block.174=soul_torch soul_wall_torch
block.175=torch wall_torch
block.176=westerosblocks:safe_fire
block.177=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
####### ----- reflective translucents / glass ----- ####### ####### ----- reflective translucents / glass ----- #######

78
shaders/dimensions/setup.csh
View File

@ -9,6 +9,7 @@ const ivec3 workGroups = ivec3(4, 5, 1);
const vec3 LightColor_Amethyst = vec3(0.464, 0.227, 0.788); 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_Candles = vec3(1.0, 0.4, 0.1);
const vec3 LightColor_CopperBulb = vec3(1.0); const vec3 LightColor_CopperBulb = vec3(1.0);
const vec3 LightColor_LightBlock = vec3(1.0);
const vec3 LightColor_RedstoneTorch = vec3(0.939, 0.305, 0.164); const vec3 LightColor_RedstoneTorch = vec3(0.939, 0.305, 0.164);
const vec3 LightColor_SeaPickle = vec3(0.283, 0.394, 0.212); const vec3 LightColor_SeaPickle = vec3(0.283, 0.394, 0.212);
@ -183,6 +184,83 @@ void main() {
lightColor = vec3(0.659, 0.302, 0.106); lightColor = vec3(0.659, 0.302, 0.106);
lightRange = 15.0; lightRange = 15.0;
break; break;
case BLOCK_LIGHT_1:
lightColor = LightColor_LightBlock;
lightRange = 1;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_2:
lightColor = LightColor_LightBlock;
lightRange = 2;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_3:
lightColor = LightColor_LightBlock;
lightRange = 3;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_4:
lightColor = LightColor_LightBlock;
lightRange = 4;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_5:
lightColor = LightColor_LightBlock;
lightRange = 5;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_6:
lightColor = LightColor_LightBlock;
lightRange = 6;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_7:
lightColor = LightColor_LightBlock;
lightRange = 7;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_8:
lightColor = LightColor_LightBlock;
lightRange = 8;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_9:
lightColor = LightColor_LightBlock;
lightRange = 9;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_10:
lightColor = LightColor_LightBlock;
lightRange = 10;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_11:
lightColor = LightColor_LightBlock;
lightRange = 11;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_12:
lightColor = LightColor_LightBlock;
lightRange = 12;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_13:
lightColor = LightColor_LightBlock;
lightRange = 13;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_14:
lightColor = LightColor_LightBlock;
lightRange = 14;
mixWeight = 1.0;
break;
case BLOCK_LIGHT_15:
lightColor = LightColor_LightBlock;
lightRange = 15;
mixWeight = 1.0;
break;
case BLOCK_MAGMA: case BLOCK_MAGMA:
lightColor = vec3(0.747, 0.323, 0.110); lightColor = vec3(0.747, 0.323, 0.110);
lightRange = 3.0; lightRange = 3.0;

79
shaders/lib/blocks.glsl
View File

@ -42,38 +42,53 @@
#define BLOCK_JACK_O_LANTERN 126 #define BLOCK_JACK_O_LANTERN 126
#define BLOCK_LANTERN 127 #define BLOCK_LANTERN 127
#define BLOCK_LAVA 128 #define BLOCK_LAVA 128
#define BLOCK_MAGMA 129 #define BLOCK_LIGHT_1 129
#define BLOCK_REDSTONE_LAMP_LIT 130 #define BLOCK_LIGHT_2 130
#define BLOCK_REDSTONE_TORCH_LIT 131 #define BLOCK_LIGHT_3 131
#define BLOCK_REDSTONE_WIRE_1 132 #define BLOCK_LIGHT_4 132
#define BLOCK_REDSTONE_WIRE_2 133 #define BLOCK_LIGHT_5 133
#define BLOCK_REDSTONE_WIRE_3 134 #define BLOCK_LIGHT_6 134
#define BLOCK_REDSTONE_WIRE_4 135 #define BLOCK_LIGHT_7 135
#define BLOCK_REDSTONE_WIRE_5 136 #define BLOCK_LIGHT_8 136
#define BLOCK_REDSTONE_WIRE_6 137 #define BLOCK_LIGHT_9 137
#define BLOCK_REDSTONE_WIRE_7 138 #define BLOCK_LIGHT_10 138
#define BLOCK_REDSTONE_WIRE_8 139 #define BLOCK_LIGHT_11 139
#define BLOCK_REDSTONE_WIRE_9 140 #define BLOCK_LIGHT_12 140
#define BLOCK_REDSTONE_WIRE_10 141 #define BLOCK_LIGHT_13 141
#define BLOCK_REDSTONE_WIRE_11 142 #define BLOCK_LIGHT_14 142
#define BLOCK_REDSTONE_WIRE_12 143 #define BLOCK_LIGHT_15 143
#define BLOCK_REDSTONE_WIRE_13 144 #define BLOCK_MAGMA 144
#define BLOCK_REDSTONE_WIRE_14 145 #define BLOCK_REDSTONE_LAMP_LIT 145
#define BLOCK_REDSTONE_WIRE_15 146 #define BLOCK_REDSTONE_TORCH_LIT 146
#define BLOCK_REPEATER_LIT 147 #define BLOCK_REDSTONE_WIRE_1 147
#define BLOCK_RESPAWN_ANCHOR_4 148 #define BLOCK_REDSTONE_WIRE_2 148
#define BLOCK_SCULK_SENSOR_ACTIVE 149 #define BLOCK_REDSTONE_WIRE_3 149
#define BLOCK_SEA_PICKLE_WET_1 150 #define BLOCK_REDSTONE_WIRE_4 150
#define BLOCK_SEA_PICKLE_WET_2 151 #define BLOCK_REDSTONE_WIRE_5 151
#define BLOCK_SEA_PICKLE_WET_3 152 #define BLOCK_REDSTONE_WIRE_6 152
#define BLOCK_SEA_PICKLE_WET_4 153 #define BLOCK_REDSTONE_WIRE_7 153
#define BLOCK_SEA_LANTERN 154 #define BLOCK_REDSTONE_WIRE_8 154
#define BLOCK_SHROOMLIGHT 155 #define BLOCK_REDSTONE_WIRE_9 155
#define BLOCK_SMOKER_LIT 156 #define BLOCK_REDSTONE_WIRE_10 156
#define BLOCK_SOUL_FIRE 157 #define BLOCK_REDSTONE_WIRE_11 157
#define BLOCK_SOUL_LANTERN 158 #define BLOCK_REDSTONE_WIRE_12 158
#define BLOCK_SOUL_TORCH 159 #define BLOCK_REDSTONE_WIRE_13 159
#define BLOCK_TORCH 160 #define BLOCK_REDSTONE_WIRE_14 160
#define BLOCK_REDSTONE_WIRE_15 161
#define BLOCK_REPEATER_LIT 162
#define BLOCK_RESPAWN_ANCHOR_4 163
#define BLOCK_SCULK_SENSOR_ACTIVE 164
#define BLOCK_SEA_PICKLE_WET_1 165
#define BLOCK_SEA_PICKLE_WET_2 166
#define BLOCK_SEA_PICKLE_WET_3 167
#define BLOCK_SEA_PICKLE_WET_4 168
#define BLOCK_SEA_LANTERN 169
#define BLOCK_SHROOMLIGHT 170
#define BLOCK_SMOKER_LIT 171
#define BLOCK_SOUL_FIRE 172
#define BLOCK_SOUL_LANTERN 173
#define BLOCK_SOUL_TORCH 174
#define BLOCK_TORCH 175
#define BLOCK_GLASS 201 #define BLOCK_GLASS 201
#define BLOCK_HONEY 202 #define BLOCK_HONEY 202
#define BLOCK_ICE 203 #define BLOCK_ICE 203

3
shaders/shaders.properties
View File

@ -8,7 +8,7 @@ separateAo = true
rain.depth = false rain.depth = false
beacon.beam.depth = true beacon.beam.depth = true
iris.features.optional=ENTITY_TRANSLUCENT REVERSED_CULLING COMPUTE_SHADERS CUSTOM_IMAGES SSBO iris.features.optional = ENTITY_TRANSLUCENT REVERSED_CULLING COMPUTE_SHADERS CUSTOM_IMAGES SSBO
#if RESOURCEPACK_SKY == 2 #if RESOURCEPACK_SKY == 2
sun=true sun=true
@ -21,6 +21,7 @@ iris.features.optional=ENTITY_TRANSLUCENT REVERSED_CULLING COMPUTE_SHADERS CUSTO
#ifdef LPV_ENABLED #ifdef LPV_ENABLED
# shadow.enabled = true # shadow.enabled = true
shadow.culling = reversed shadow.culling = reversed
voxelizeLightBlocks = true
#endif #endif
#ifndef RENDER_ENTITY_SHADOWS #ifndef RENDER_ENTITY_SHADOWS