add wall IDs

This commit is contained in:
NULL511 2024-05-25 13:09:32 -04:00
parent dde6acac97
commit 36c9bef3f0
4 changed files with 391 additions and 0 deletions

File diff suppressed because one or more lines are too long

View File

@ -979,6 +979,27 @@ void main() {
break; break;
} }
// WALL
if (blockId >= BLOCK_WALL_MIN && blockId <= BLOCK_WALL_MAX) {
mixWeight = 0.25;
if (blockId == BLOCK_WALL_POST_TALL_ALL || blockId == BLOCK_WALL_TALL_ALL
|| blockId == BLOCK_WALL_POST_TALL_N_W_S
|| blockId == BLOCK_WALL_POST_TALL_N_E_S
|| blockId == BLOCK_WALL_POST_TALL_W_N_E
|| blockId == BLOCK_WALL_POST_TALL_W_S_E) {
mixMask = BuildLpvMask(0u, 0u, 0u, 0u, 1u, 1u);
mixWeight = 0.125;
}
else if (blockId == BLOCK_WALL_POST_TALL_N_S || blockId == BLOCK_WALL_TALL_N_S) {
mixMask = BuildLpvMask(1u, 0u, 1u, 0u, 1u, 1u);
}
else if (blockId == BLOCK_WALL_POST_TALL_W_E || blockId == BLOCK_WALL_TALL_W_E) {
mixMask = BuildLpvMask(0u, 1u, 0u, 1u, 1u, 1u);
}
// TODO: more walls
}
// Misc // Misc
if (blockId == BLOCK_SIGN) { if (blockId == BLOCK_SIGN) {

View File

@ -200,5 +200,64 @@
#define BLOCK_TRAPDOOR_E 417 #define BLOCK_TRAPDOOR_E 417
#define BLOCK_TRAPDOOR_S 418 #define BLOCK_TRAPDOOR_S 418
#define BLOCK_TRAPDOOR_W 419 #define BLOCK_TRAPDOOR_W 419
#define BLOCK_WALL_POST 420
#define BLOCK_WALL_MIN 420
#define BLOCK_WALL_POST_LOW_N 421
#define BLOCK_WALL_POST_LOW_E 422
#define BLOCK_WALL_POST_LOW_S 423
#define BLOCK_WALL_POST_LOW_W 424
#define BLOCK_WALL_POST_LOW_N_S 425
#define BLOCK_WALL_POST_LOW_W_E 426
#define BLOCK_WALL_POST_LOW_N_W 427
#define BLOCK_WALL_POST_LOW_N_E 428
#define BLOCK_WALL_POST_LOW_S_W 429
#define BLOCK_WALL_POST_LOW_S_E 430
#define BLOCK_WALL_POST_LOW_N_W_S 431
#define BLOCK_WALL_POST_LOW_N_E_S 432
#define BLOCK_WALL_POST_LOW_W_N_E 433
#define BLOCK_WALL_POST_LOW_W_S_E 434
#define BLOCK_WALL_POST_LOW_ALL 435
#define BLOCK_WALL_POST_TALL_N 436
#define BLOCK_WALL_POST_TALL_E 437
#define BLOCK_WALL_POST_TALL_S 438
#define BLOCK_WALL_POST_TALL_W 439
#define BLOCK_WALL_POST_TALL_N_S 440
#define BLOCK_WALL_POST_TALL_W_E 441
#define BLOCK_WALL_POST_TALL_N_W 442
#define BLOCK_WALL_POST_TALL_N_E 443
#define BLOCK_WALL_POST_TALL_S_W 444
#define BLOCK_WALL_POST_TALL_S_E 445
#define BLOCK_WALL_POST_TALL_N_W_S 446
#define BLOCK_WALL_POST_TALL_N_E_S 447
#define BLOCK_WALL_POST_TALL_W_N_E 448
#define BLOCK_WALL_POST_TALL_W_S_E 449
#define BLOCK_WALL_POST_TALL_ALL 450
#define BLOCK_WALL_POST_TALL_N_LOW_S 451
#define BLOCK_WALL_POST_TALL_E_LOW_W 452
#define BLOCK_WALL_POST_TALL_S_LOW_N 453
#define BLOCK_WALL_POST_TALL_W_LOW_E 454
#define BLOCK_WALL_POST_TALL_N_S_LOW_W_E 455
#define BLOCK_WALL_POST_TALL_W_E_LOW_N_S 456
#define BLOCK_WALL_POST_TALL_N_W_LOW_S_E 457
#define BLOCK_WALL_POST_TALL_N_E_LOW_S_W 458
#define BLOCK_WALL_POST_TALL_S_W_LOW_N_E 459
#define BLOCK_WALL_POST_TALL_S_E_LOW_N_W 460
#define BLOCK_WALL_LOW_N_S 461
#define BLOCK_WALL_LOW_W_E 462
#define BLOCK_WALL_LOW_N_W 463
#define BLOCK_WALL_LOW_N_E 464
#define BLOCK_WALL_LOW_S_W 465
#define BLOCK_WALL_LOW_S_E 466
#define BLOCK_WALL_LOW_ALL 467
#define BLOCK_WALL_TALL_N_S 468
#define BLOCK_WALL_TALL_W_E 469
#define BLOCK_WALL_TALL_N_W 470
#define BLOCK_WALL_TALL_N_E 471
#define BLOCK_WALL_TALL_S_W 472
#define BLOCK_WALL_TALL_S_E 473
#define BLOCK_WALL_TALL_ALL 474
#define BLOCK_WALL_TALL_N_S_LOW_W_E 475
#define BLOCK_WALL_TALL_W_E_LOW_N_S 476
#define BLOCK_WALL_MAX 476
#define BLOCK_END_PORTAL 500 #define BLOCK_END_PORTAL 500
#define BLOCK_SIGN 501 #define BLOCK_SIGN 501

View File

@ -674,6 +674,201 @@ block.*= vine
#= BLOCK_TRAPDOOR_W #= BLOCK_TRAPDOOR_W
block.*= [trapdoor]:facing=west:open=true block.*= [trapdoor]:facing=west:open=true
#=== WALLS ===#
group.wall=cobblestone_wall andesite_wall blackstone_wall brick_wall \
cobbled_deepslate_wall deepslate_brick_wall deepslate_tile_wall diorite_wall \
end_stone_brick_wall granite_wall mossy_cobblestone_wall mossy_stone_brick_wall \
mud_brick_wall nether_brick_wall polished_blackstone_brick_wall polished_blackstone_wall \
polished_deepslate_wall prismarine_wall red_nether_brick_wall red_sandstone_wall \
sandstone_wall stone_brick_wall \
\
create:cut_andesite_wall create:polished_cut_andesite_wall create:cut_andesite_brick_wall create:small_andesite_brick_wall \
create:cut_asurine_wall create:polished_cut_asurine_wall create:cut_asurine_brick_wall create:small_asurine_brick_wall \
create:cut_calcite_wall create:polished_cut_calcite_wall create:cut_calcite_brick_wall create:small_calcite_brick_wall \
create:cut_crimsite_wall create:polished_cut_crimsite_wall create:cut_crimsite_brick_wall create:small_crimsite_brick_wall \
create:cut_deepslate_wall create:polished_cut_deepslate_wall create:cut_deepslate_brick_wall create:small_deepslate_brick_wall \
create:cut_diorite_wall create:polished_cut_diorite_wall create:cut_diorite_brick_wall create:small_diorite_brick_wall \
create:cut_dripstone_wall create:polished_cut_dripstone_wall create:cut_dripstone_brick_wall create:small_dripstone_brick_wall \
create:cut_granite_wall create:polished_cut_granite_wall create:cut_granite_brick_wall create:small_granite_brick_wall \
create:cut_limestone_wall create:polished_cut_limestone_wall create:cut_limestone_brick_wall create:small_limestone_brick_wall \
create:cut_ochrum_wall create:polished_cut_ochrum_wall create:cut_ochrum_brick_wall create:small_ochrum_brick_wall \
create:cut_scorchia_wall create:polished_cut_scorchia_wall create:cut_scorchia_brick_wall create:small_scorchia_brick_wall \
create:cut_scoria_wall create:polished_cut_scoria_wall create:cut_scoria_brick_wall create:small_scoria_brick_wall \
create:cut_tuff_wall create:polished_cut_tuff_wall create:cut_tuff_brick_wall create:small_tuff_brick_wall \
create:cut_veridium_wall create:polished_cut_veridium_wall create:cut_veridium_brick_wall create:small_veridium_brick_wall
#= BLOCK_WALL_POST, BLOCK_WALL_MIN
block.*=[wall]:north=none:east=none:south=none:west=none:up=true
#= BLOCK_WALL_POST_LOW_N
block.*=[wall]:north=low:east=none:south=none:west=none:up=true
#= BLOCK_WALL_POST_LOW_E
block.*=[wall]:north=none:east=low:south=none:west=none:up=true
#= BLOCK_WALL_POST_LOW_S
block.*=[wall]:north=none:east=none:south=low:west=none:up=true
#= BLOCK_WALL_POST_LOW_W
block.*=[wall]:north=none:east=none:south=none:west=low:up=true
#= BLOCK_WALL_POST_LOW_N_S
block.*=[wall]:north=low:east=none:south=low:west=none:up=true
#= BLOCK_WALL_POST_LOW_W_E
block.*=[wall]:north=none:east=low:south=none:west=low:up=true
#= BLOCK_WALL_POST_LOW_N_W
block.*=[wall]:north=low:east=none:south=none:west=low:up=true
#= BLOCK_WALL_POST_LOW_N_E
block.*=[wall]:north=low:east=low:south=none:west=none:up=true
#= BLOCK_WALL_POST_LOW_S_W
block.*=[wall]:north=none:east=none:south=low:west=low:up=true
#= BLOCK_WALL_POST_LOW_S_E
block.*=[wall]:north=none:east=low:south=low:west=none:up=true
#= BLOCK_WALL_POST_LOW_N_W_S
block.*=[wall]:north=low:east=none:south=low:west=low:up=true
#= BLOCK_WALL_POST_LOW_N_E_S
block.*=[wall]:north=low:east=low:south=low:west=none:up=true
#= BLOCK_WALL_POST_LOW_W_N_E
block.*=[wall]:north=low:east=low:south=none:west=low:up=true
#= BLOCK_WALL_POST_LOW_W_S_E
block.*=[wall]:north=none:east=low:south=low:west=low:up=true
#= BLOCK_WALL_POST_LOW_ALL
block.*=[wall]:north=low:east=low:south=low:west=low:up=true
#= BLOCK_WALL_POST_TALL_N
block.*=[wall]:north=tall:east=none:south=none:west=none:up=true
#= BLOCK_WALL_POST_TALL_E
block.*=[wall]:north=none:east=tall:south=none:west=none:up=true
#= BLOCK_WALL_POST_TALL_S
block.*=[wall]:north=none:east=none:south=tall:west=none:up=true
#= BLOCK_WALL_POST_TALL_W
block.*=[wall]:north=none:east=none:south=none:west=tall:up=true
#= BLOCK_WALL_POST_TALL_N_S
block.*=[wall]:north=tall:east=none:south=tall:west=none:up=true
#= BLOCK_WALL_POST_TALL_W_E
block.*=[wall]:north=none:east=tall:south=none:west=tall:up=true
#= BLOCK_WALL_POST_TALL_N_W
block.*=[wall]:north=tall:east=none:south=none:west=tall:up=true
#= BLOCK_WALL_POST_TALL_N_E
block.*=[wall]:north=tall:east=tall:south=none:west=none:up=true
#= BLOCK_WALL_POST_TALL_S_W
block.*=[wall]:north=none:east=none:south=tall:west=tall:up=true
#= BLOCK_WALL_POST_TALL_S_E
block.*=[wall]:north=none:east=tall:south=tall:west=none:up=true
#= BLOCK_WALL_POST_TALL_N_W_S
block.*=[wall]:north=tall:east=none:south=tall:west=tall:up=true
#= BLOCK_WALL_POST_TALL_N_E_S
block.*=[wall]:north=tall:east=tall:south=tall:west=none:up=true
#= BLOCK_WALL_POST_TALL_W_N_E
block.*=[wall]:north=tall:east=tall:south=none:west=tall:up=true
#= BLOCK_WALL_POST_TALL_W_S_E
block.*=[wall]:north=none:east=tall:south=tall:west=tall:up=true
#= BLOCK_WALL_POST_TALL_ALL
block.*=[wall]:north=tall:east=tall:south=tall:west=tall:up=true
#= BLOCK_WALL_POST_TALL_N_LOW_S
block.*=[wall]:north=tall:east=none:south=low:west=none:up=true
#= BLOCK_WALL_POST_TALL_E_LOW_W
block.*=[wall]:north=none:east=tall:south=none:west=low:up=true
#= BLOCK_WALL_POST_TALL_S_LOW_N
block.*=[wall]:north=low:east=none:south=tall:west=none:up=true
#= BLOCK_WALL_POST_TALL_W_LOW_E
block.*=[wall]:north=none:east=low:south=none:west=tall:up=true
#= BLOCK_WALL_POST_TALL_N_S_LOW_W_E
block.*=[wall]:north=tall:east=low:south=tall:west=low:up=true
#= BLOCK_WALL_POST_TALL_W_E_LOW_N_S
block.*=[wall]:north=low:east=tall:south=low:west=tall:up=true
#= BLOCK_WALL_POST_TALL_N_W_LOW_S_E
block.*=[wall]:north=tall:east=low:south=low:west=tall:up=true
#= BLOCK_WALL_POST_TALL_N_E_LOW_S_W
block.*=[wall]:north=tall:east=tall:south=low:west=low:up=true
#= BLOCK_WALL_POST_TALL_S_W_LOW_N_E
block.*=[wall]:north=low:east=low:south=tall:west=tall:up=true
#= BLOCK_WALL_POST_TALL_S_E_LOW_N_W
block.*=[wall]:north=low:east=tall:south=tall:west=low:up=true
#= BLOCK_WALL_LOW_N_S
block.*=[wall]:north=low:east=none:south=low:west=none:up=false
#= BLOCK_WALL_LOW_W_E
block.*=[wall]:north=none:east=low:south=none:west=low:up=false
#= BLOCK_WALL_LOW_N_W
block.*=[wall]:north=low:east=none:south=none:west=low:up=false
#= BLOCK_WALL_LOW_N_E
block.*=[wall]:north=low:east=low:south=none:west=none:up=false
#= BLOCK_WALL_LOW_S_W
block.*=[wall]:north=none:east=none:south=low:west=low:up=false
#= BLOCK_WALL_LOW_S_E
block.*=[wall]:north=none:east=low:south=low:west=none:up=false
#= BLOCK_WALL_LOW_ALL
block.*=[wall]:north=low:east=low:south=low:west=low:up=false
#= BLOCK_WALL_TALL_N_S
block.*=[wall]:north=tall:east=none:south=tall:west=none:up=false
#= BLOCK_WALL_TALL_W_E
block.*=[wall]:north=none:east=tall:south=none:west=tall:up=false
#= BLOCK_WALL_TALL_N_W
block.*=[wall]:north=tall:east=none:south=none:west=tall:up=false
#= BLOCK_WALL_TALL_N_E
block.*=[wall]:north=tall:east=tall:south=none:west=none:up=false
#= BLOCK_WALL_TALL_S_W
block.*=[wall]:north=none:east=none:south=tall:west=tall:up=false
#= BLOCK_WALL_TALL_S_E
block.*=[wall]:north=none:east=tall:south=tall:west=none:up=false
#= BLOCK_WALL_TALL_ALL
block.*=[wall]:north=tall:east=tall:south=tall:west=tall:up=false
#= BLOCK_WALL_TALL_N_S_LOW_W_E
block.*=[wall]:north=tall:east=low:south=tall:west=low:up=false
#= BLOCK_WALL_TALL_W_E_LOW_N_S, BLOCK_WALL_MAX
block.*=[wall]:north=low:east=tall:south=low:west=tall:up=false
####### ----- misc ----- ####### ####### ----- misc ----- #######