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

floodfill dropped item fix; reduce occlusion groups

Browse Source
This commit is contained in:
NULL511
2024-07-20 02:46:18 -04:00
parent ed159c9868
commit c3eae1a2dd
8 changed files with 235 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
shaders/lib/blocks.glsl
View File

@ -6,9 +6,13 @@
#define BLOCK_SAPLING 15
#define BLOCK_VINE 16
#define BLOCK_VINE_OTHER 17
#define BLOCK_GROUND_WAVING 60
#define BLOCK_GROUND_WAVING_VERTICAL 61
#define BLOCK_AIR_WAVING 62
#define BLOCK_LPV_IGNORE 50
#define BLOCK_LPV_MIN 51
#define BLOCK_LPV_MED 52
#define BLOCK_LPV_MAX 53
#define BLOCK_GROUND_WAVING 54
#define BLOCK_GROUND_WAVING_VERTICAL 55
#define BLOCK_AIR_WAVING 56
#define BLOCK_SSS_STRONG 80
#define BLOCK_SSS_WEAK 81
#define BLOCK_SSS_WEAK_2 82
@ -199,84 +203,79 @@
#define BLOCK_ICE 319
#define BLOCK_NETHER_PORTAL 320
#define BLOCK_SLIME 321
#define BLOCK_LPV_IGNORE 401
#define BLOCK_CARPET 402
#define BLOCK_DOOR_N 403
#define BLOCK_DOOR_E 404
#define BLOCK_DOOR_S 405
#define BLOCK_DOOR_W 406
#define BLOCK_FENCE 407
#define BLOCK_FENCE_GATE 408
#define BLOCK_FLOWER_POT 409
#define BLOCK_IRON_BARS 410
#define BLOCK_PRESSURE_PLATE 411
#define BLOCK_SLAB_TOP 412
#define BLOCK_SLAB_BOTTOM 413
#define BLOCK_SNOW_LAYERS 414
#define BLOCK_TRAPDOOR_BOTTOM 415
#define BLOCK_TRAPDOOR_TOP 416
#define BLOCK_TRAPDOOR_N 417
#define BLOCK_TRAPDOOR_E 418
#define BLOCK_TRAPDOOR_S 419
#define BLOCK_TRAPDOOR_W 420
#define BLOCK_WALL_POST 421
#define BLOCK_WALL_MIN 421
#define BLOCK_WALL_POST_LOW_N 422
#define BLOCK_WALL_POST_LOW_E 423
#define BLOCK_WALL_POST_LOW_S 424
#define BLOCK_WALL_POST_LOW_W 425
#define BLOCK_WALL_POST_LOW_N_S 426
#define BLOCK_WALL_POST_LOW_W_E 427
#define BLOCK_WALL_POST_LOW_N_W 428
#define BLOCK_WALL_POST_LOW_N_E 429
#define BLOCK_WALL_POST_LOW_S_W 430
#define BLOCK_WALL_POST_LOW_S_E 431
#define BLOCK_WALL_POST_LOW_N_W_S 432
#define BLOCK_WALL_POST_LOW_N_E_S 433
#define BLOCK_WALL_POST_LOW_W_N_E 434
#define BLOCK_WALL_POST_LOW_W_S_E 435
#define BLOCK_WALL_POST_LOW_ALL 436
#define BLOCK_WALL_POST_TALL_N 437
#define BLOCK_WALL_POST_TALL_E 438
#define BLOCK_WALL_POST_TALL_S 439
#define BLOCK_WALL_POST_TALL_W 440
#define BLOCK_WALL_POST_TALL_N_S 441
#define BLOCK_WALL_POST_TALL_W_E 442
#define BLOCK_WALL_POST_TALL_N_W 443
#define BLOCK_WALL_POST_TALL_N_E 444
#define BLOCK_WALL_POST_TALL_S_W 445
#define BLOCK_WALL_POST_TALL_S_E 446
#define BLOCK_WALL_POST_TALL_N_W_S 447
#define BLOCK_WALL_POST_TALL_N_E_S 448
#define BLOCK_WALL_POST_TALL_W_N_E 449
#define BLOCK_WALL_POST_TALL_W_S_E 450
#define BLOCK_WALL_POST_TALL_ALL 451
#define BLOCK_WALL_POST_TALL_N_LOW_S 452
#define BLOCK_WALL_POST_TALL_E_LOW_W 453
#define BLOCK_WALL_POST_TALL_S_LOW_N 454
#define BLOCK_WALL_POST_TALL_W_LOW_E 455
#define BLOCK_WALL_POST_TALL_N_S_LOW_W_E 456
#define BLOCK_WALL_POST_TALL_W_E_LOW_N_S 457
#define BLOCK_WALL_POST_TALL_N_W_LOW_S_E 458
#define BLOCK_WALL_POST_TALL_N_E_LOW_S_W 459
#define BLOCK_WALL_POST_TALL_S_W_LOW_N_E 460
#define BLOCK_WALL_POST_TALL_S_E_LOW_N_W 461
#define BLOCK_WALL_LOW_N_S 462
#define BLOCK_WALL_LOW_W_E 463
#define BLOCK_WALL_LOW_N_W 464
#define BLOCK_WALL_LOW_N_E 465
#define BLOCK_WALL_LOW_S_W 466
#define BLOCK_WALL_LOW_S_E 467
#define BLOCK_WALL_LOW_ALL 468
#define BLOCK_WALL_TALL_N_S 469
#define BLOCK_WALL_TALL_W_E 470
#define BLOCK_WALL_TALL_N_W 471
#define BLOCK_WALL_TALL_N_E 472
#define BLOCK_WALL_TALL_S_W 473
#define BLOCK_WALL_TALL_S_E 474
#define BLOCK_WALL_TALL_ALL 475
#define BLOCK_WALL_TALL_N_S_LOW_W_E 476
#define BLOCK_WALL_TALL_W_E_LOW_N_S 477
#define BLOCK_WALL_MAX 477
#define BLOCK_CARPET 401
#define BLOCK_DOOR_N 402
#define BLOCK_DOOR_E 403
#define BLOCK_DOOR_S 404
#define BLOCK_DOOR_W 405
#define BLOCK_PRESSURE_PLATE 406
#define BLOCK_SLAB_TOP 407
#define BLOCK_SLAB_BOTTOM 408
#define BLOCK_SNOW_LAYERS 409
#define BLOCK_TRAPDOOR_BOTTOM 410
#define BLOCK_TRAPDOOR_TOP 411
#define BLOCK_TRAPDOOR_N 412
#define BLOCK_TRAPDOOR_E 413
#define BLOCK_TRAPDOOR_S 414
#define BLOCK_TRAPDOOR_W 415
#define BLOCK_WALL_POST 416
#define BLOCK_WALL_MIN 416
#define BLOCK_WALL_POST_LOW_N 417
#define BLOCK_WALL_POST_LOW_E 418
#define BLOCK_WALL_POST_LOW_S 419
#define BLOCK_WALL_POST_LOW_W 420
#define BLOCK_WALL_POST_LOW_N_S 421
#define BLOCK_WALL_POST_LOW_W_E 422
#define BLOCK_WALL_POST_LOW_N_W 423
#define BLOCK_WALL_POST_LOW_N_E 424
#define BLOCK_WALL_POST_LOW_S_W 425
#define BLOCK_WALL_POST_LOW_S_E 426
#define BLOCK_WALL_POST_LOW_N_W_S 427
#define BLOCK_WALL_POST_LOW_N_E_S 428
#define BLOCK_WALL_POST_LOW_W_N_E 429
#define BLOCK_WALL_POST_LOW_W_S_E 430
#define BLOCK_WALL_POST_LOW_ALL 431
#define BLOCK_WALL_POST_TALL_N 432
#define BLOCK_WALL_POST_TALL_E 433
#define BLOCK_WALL_POST_TALL_S 434
#define BLOCK_WALL_POST_TALL_W 435
#define BLOCK_WALL_POST_TALL_N_S 436
#define BLOCK_WALL_POST_TALL_W_E 437
#define BLOCK_WALL_POST_TALL_N_W 438
#define BLOCK_WALL_POST_TALL_N_E 439
#define BLOCK_WALL_POST_TALL_S_W 440
#define BLOCK_WALL_POST_TALL_S_E 441
#define BLOCK_WALL_POST_TALL_N_W_S 442
#define BLOCK_WALL_POST_TALL_N_E_S 443
#define BLOCK_WALL_POST_TALL_W_N_E 444
#define BLOCK_WALL_POST_TALL_W_S_E 445
#define BLOCK_WALL_POST_TALL_ALL 446
#define BLOCK_WALL_POST_TALL_N_LOW_S 447
#define BLOCK_WALL_POST_TALL_E_LOW_W 448
#define BLOCK_WALL_POST_TALL_S_LOW_N 449
#define BLOCK_WALL_POST_TALL_W_LOW_E 450
#define BLOCK_WALL_POST_TALL_N_S_LOW_W_E 451
#define BLOCK_WALL_POST_TALL_W_E_LOW_N_S 452
#define BLOCK_WALL_POST_TALL_N_W_LOW_S_E 453
#define BLOCK_WALL_POST_TALL_N_E_LOW_S_W 454
#define BLOCK_WALL_POST_TALL_S_W_LOW_N_E 455
#define BLOCK_WALL_POST_TALL_S_E_LOW_N_W 456
#define BLOCK_WALL_LOW_N_S 457
#define BLOCK_WALL_LOW_W_E 458
#define BLOCK_WALL_LOW_N_W 459
#define BLOCK_WALL_LOW_N_E 460
#define BLOCK_WALL_LOW_S_W 461
#define BLOCK_WALL_LOW_S_E 462
#define BLOCK_WALL_LOW_ALL 463
#define BLOCK_WALL_TALL_N_S 464
#define BLOCK_WALL_TALL_W_E 465
#define BLOCK_WALL_TALL_N_W 466
#define BLOCK_WALL_TALL_N_E 467
#define BLOCK_WALL_TALL_S_W 468
#define BLOCK_WALL_TALL_S_E 469
#define BLOCK_WALL_TALL_ALL 470
#define BLOCK_WALL_TALL_N_S_LOW_W_E 471
#define BLOCK_WALL_TALL_W_E_LOW_N_S 472
#define BLOCK_WALL_MAX 472
#define BLOCK_END_PORTAL 500
#define BLOCK_SIGN 501

9
shaders/lib/voxel_write.glsl
View File

@ -38,8 +38,13 @@ void PopulateShadowVoxel(const in vec3 playerPos) {
voxelId = uint(blockEntityId);
}
else if (currentRenderedItemId > 0 && currentRenderedItemId < 1200) {
if (entityId != ENTITY_ITEM_FRAME && entityId != ENTITY_PLAYER)
voxelId = uint(currentRenderedItemId);
if (entityId != ENTITY_ITEM_FRAME && entityId != ENTITY_PLAYER) {
uint blockDataR = texelFetch(texBlockData, currentRenderedItemId, 0).r;
float lightRange = unpackUnorm4x8(blockDataR).a * 255.0;
if (lightRange > 0.0)
voxelId = uint(currentRenderedItemId);
}
}
else {
switch (entityId) {