Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2025-06-22 00:37:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

remap block ranges; add more lpv block mappings

Browse Source
This commit is contained in:
NULL511
2024-05-03 17:50:37 -04:00
parent 8a3a43e28c
commit f577d2f4dd
9 changed files with 236 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
shaders/lib/blocks.glsl
View File

@ -1,84 +1,88 @@
#define BLOCK_WATER 8
#define BLOCK_GROUND_WAVING 10
#define BLOCK_AIR_WAVING 11
#define BLOCK_GROUND_WAVING_VERTICAL 12
#define BLOCK_SSS_STRONG 13
#define BLOCK_SSS_WEAK 14
#define BLOCK_SSS_WEAK_2 15
#define BLOCK_SSS_WEAK_3 16
#define BLOCK_SSS_WEIRD 17
#define BLOCK_GRASS 18
#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
#define BLOCK_ICE 1203
#define BLOCK_NETHER_PORTAL 1204
#define BLOCK_SLIME 1205
#define BLOCK_GLASS_BLACK 1206
#define BLOCK_GLASS_BLUE 1207
#define BLOCK_GLASS_BROWN 1208
#define BLOCK_GLASS_CYAN 1209
#define BLOCK_GLASS_GRAY 1210
#define BLOCK_GLASS_GREEN 1211
#define BLOCK_GLASS_LIGHT_BLUE 1212
#define BLOCK_GLASS_LIGHT_GRAY 1213
#define BLOCK_GLASS_LIME 1214
#define BLOCK_GLASS_MAGENTA 1215
#define BLOCK_GLASS_ORANGE 1216
#define BLOCK_GLASS_PINK 1217
#define BLOCK_GLASS_PURPLE 1218
#define BLOCK_GLASS_RED 1219
#define BLOCK_GLASS_WHITE 1220
#define BLOCK_GLASS_YELLOW 1221
#define BLOCK_DOOR_N 1222
#define BLOCK_DOOR_E 1223
#define BLOCK_DOOR_S 1224
#define BLOCK_DOOR_W 1225
#define BLOCK_SLAB_TOP 1226
#define BLOCK_SLAB_BOTTOM 1227
#define BLOCK_TRAPDOOR_BOTTOM 1228
#define BLOCK_TRAPDOOR_TOP 1229
#define BLOCK_TRAPDOOR_N 1230
#define BLOCK_TRAPDOOR_E 1231
#define BLOCK_TRAPDOOR_S 1232
#define BLOCK_TRAPDOOR_W 1233
#define BLOCK_END_PORTAL 2100
#define BLOCK_NO_POM 2200
#define BLOCK_REDSTONE_WIRE 3000
#define BLOCK_GRASS_SHORT 10
#define BLOCK_GRASS_TALL_LOWER 11
#define BLOCK_GRASS_TALL_UPPER 12
#define BLOCK_GROUND_WAVING 20
#define BLOCK_GROUND_WAVING_VERTICAL 21
#define BLOCK_AIR_WAVING 22
#define BLOCK_SSS_STRONG 23
#define BLOCK_SSS_WEAK 24
#define BLOCK_SSS_WEAK_2 25
#define BLOCK_SSS_WEAK_3 26
#define BLOCK_SSS_WEIRD 27
#define BLOCK_GRASS 28
#define BLOCK_AMETHYST_BUD_LARGE 101
#define BLOCK_AMETHYST_BUD_MEDIUM 102
#define BLOCK_AMETHYST_CLUSTER 103
#define BLOCK_BEACON 104
#define BLOCK_CANDLES_LIT_1 105
#define BLOCK_CANDLES_LIT_2 106
#define BLOCK_CANDLES_LIT_3 107
#define BLOCK_CANDLES_LIT_4 108
#define BLOCK_CAVE_VINE_BERRIES 109
#define BLOCK_CONDUIT 110
#define BLOCK_CRYING_OBSIDIAN 111
#define BLOCK_END_GATEWAY 112
#define BLOCK_END_ROD 113
#define BLOCK_FIRE 114
#define BLOCK_FROGLIGHT_OCHRE 115
#define BLOCK_FROGLIGHT_PEARLESCENT 116
#define BLOCK_FROGLIGHT_VERDANT 117
#define BLOCK_GLOW_LICHEN 118
#define BLOCK_GLOWSTONE 119
#define BLOCK_JACK_O_LANTERN 120
#define BLOCK_LANTERN 121
#define BLOCK_LAVA 122
#define BLOCK_MAGMA 123
#define BLOCK_REDSTONE_LAMP_LIT 124
#define BLOCK_REDSTONE_TORCH_LIT 125
#define BLOCK_RESPAWN_ANCHOR_4 126
#define BLOCK_SCULK_SENSOR_ACTIVE 127
#define BLOCK_SEA_PICKLE_WET_1 128
#define BLOCK_SEA_PICKLE_WET_2 129
#define BLOCK_SEA_PICKLE_WET_3 130
#define BLOCK_SEA_PICKLE_WET_4 131
#define BLOCK_SEA_LANTERN 132
#define BLOCK_SHROOMLIGHT 133
#define BLOCK_SMOKER_LIT 134
#define BLOCK_SOUL_FIRE 135
#define BLOCK_SOUL_LANTERN 136
#define BLOCK_SOUL_TORCH 137
#define BLOCK_TORCH 138
#define BLOCK_GLASS 201
#define BLOCK_HONEY 202
#define BLOCK_ICE 203
#define BLOCK_NETHER_PORTAL 204
#define BLOCK_SLIME 205
#define BLOCK_GLASS_BLACK 206
#define BLOCK_GLASS_BLUE 207
#define BLOCK_GLASS_BROWN 208
#define BLOCK_GLASS_CYAN 209
#define BLOCK_GLASS_GRAY 210
#define BLOCK_GLASS_GREEN 211
#define BLOCK_GLASS_LIGHT_BLUE 212
#define BLOCK_GLASS_LIGHT_GRAY 213
#define BLOCK_GLASS_LIME 214
#define BLOCK_GLASS_MAGENTA 215
#define BLOCK_GLASS_ORANGE 216
#define BLOCK_GLASS_PINK 217
#define BLOCK_GLASS_PURPLE 218
#define BLOCK_GLASS_RED 219
#define BLOCK_GLASS_WHITE 220
#define BLOCK_GLASS_YELLOW 221
#define BLOCK_DOOR_N 301
#define BLOCK_DOOR_E 302
#define BLOCK_DOOR_S 303
#define BLOCK_DOOR_W 304
#define BLOCK_PRESSURE_PLATE 305
#define BLOCK_SLAB_TOP 306
#define BLOCK_SLAB_BOTTOM 307
#define BLOCK_TRAPDOOR_BOTTOM 308
#define BLOCK_TRAPDOOR_TOP 309
#define BLOCK_TRAPDOOR_N 310
#define BLOCK_TRAPDOOR_E 311
#define BLOCK_TRAPDOOR_S 312
#define BLOCK_TRAPDOOR_W 313
#define BLOCK_END_PORTAL 400
#define BLOCK_SIGN 401
#define BLOCK_REDSTONE_WIRE 402

1
shaders/lib/lpv_blocks.glsl
View File

@ -13,7 +13,6 @@ struct LpvBlockData { // 12 x1280 =?
LpvBlockData LpvBlockMap[];
};
const int LpvBlockMapOffset = 999;
uint BuildBlockLpvData(uint mixMask, float mixWeight) {
uint data = uint(saturate(mixWeight) * 255.0);