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

add contents of Miki_P98's PR in main branch

Browse Source
This commit is contained in:
Xonk
2024-11-16 19:19:12 -05:00
parent 9145d19e46
commit 06c571c00a
6 changed files with 485 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shaders/dimensions/all_solid.vsh
View File

@ -316,7 +316,7 @@ void main() {
// medium
// low
if(entityId == ENTITY_SSS_WEAK || entityId == ENTITY_PLAYER) SSSAMOUNT = 0.3;
if(entityId == ENTITY_SSS_WEAK || entityId == ENTITY_PLAYER) SSSAMOUNT = 0.4;
#endif
#endif

96
shaders/dimensions/setup.csh
View File

@ -62,6 +62,10 @@ void main() {
uint mixMask = 0xFFFF;
vec3 tintColor = vec3(1.0);
if (blockId == BLOCK_SSS_WEAK || blockId == BLOCK_SSS_WEAK_3 || blockId == BLOCK_SSS_STRONG) {
mixWeight = 1.0;
}
switch (blockId) {
case BLOCK_WATER:
mixWeight = 0.8;
@ -766,7 +770,9 @@ void main() {
mixWeight = 0.8;
}
if (blockId == BLOCK_TORCH || blockId == ITEM_TORCH) {
if (blockId == BLOCK_TORCH || blockId == ITEM_TORCH ||
blockId == BLOCK_LANTERN || blockId == ITEM_LANTERN
) {
lightColor = vec3(TORCH_R, TORCH_G, TORCH_B);
lightRange = 14.0;
mixWeight = 0.8;
@ -917,7 +923,16 @@ void main() {
// LPV shapes
case BLOCK_LPV_IGNORE:
mixWeight = 1.0;
mixWeight = 1.00;
break;
case BLOCK_LPV_MIN:
mixWeight = 0.75;
break;
case BLOCK_LPV_MED:
mixWeight = 0.50;
break;
case BLOCK_LPV_MAX:
mixWeight = 0.25;
break;
case BLOCK_CARPET:
@ -942,16 +957,6 @@ void main() {
mixWeight = 0.8;
break;
case BLOCK_FENCE:
case BLOCK_FENCE_GATE:
mixWeight = 0.7;
break;
case BLOCK_FLOWER_POT:
mixWeight = 0.7;
break;
case BLOCK_IRON_BARS:
mixWeight = 0.6;
break;
case BLOCK_PRESSURE_PLATE:
mixMask = BuildLpvMask(1u, 1u, 1u, 1u, 1u, 0u);
mixWeight = 0.9;
@ -993,6 +998,73 @@ void main() {
break;
}
// STAIRS
if (blockId >= BLOCK_STAIRS_BOTTOM_N && blockId <= BLOCK_STAIRS_TOP_OUTER_S_W) {
mixWeight = 0.25;
switch (blockId) {
case BLOCK_STAIRS_BOTTOM_N:
mixMask = BuildLpvMask(1u, 1u, 0u, 1u, 1u, 0u);
break;
case BLOCK_STAIRS_BOTTOM_E:
mixMask = BuildLpvMask(1u, 1u, 1u, 0u, 1u, 0u);
break;
case BLOCK_STAIRS_BOTTOM_S:
mixMask = BuildLpvMask(0u, 1u, 1u, 1u, 1u, 0u);
break;
case BLOCK_STAIRS_BOTTOM_W:
mixMask = BuildLpvMask(1u, 0u, 1u, 1u, 1u, 0u);
break;
case BLOCK_STAIRS_BOTTOM_INNER_S_E:
mixMask = BuildLpvMask(0u, 1u, 1u, 0u, 0u, 1u);
break;
case BLOCK_STAIRS_BOTTOM_INNER_S_W:
mixMask = BuildLpvMask(0u, 0u, 1u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_BOTTOM_INNER_N_W:
mixMask = BuildLpvMask(1u, 0u, 0u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_BOTTOM_INNER_N_E:
mixMask = BuildLpvMask(1u, 1u, 0u, 0u, 0u, 1u);
break;
}
if (blockId >= BLOCK_STAIRS_BOTTOM_OUTER_N_W && blockId <= BLOCK_STAIRS_BOTTOM_OUTER_S_W) {
mixMask = BuildLpvMask(1u, 1u, 1u, 1u, 0u, 1u);
}
switch (blockId) {
case BLOCK_STAIRS_TOP_N:
mixMask = BuildLpvMask(1u, 1u, 0u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_E:
mixMask = BuildLpvMask(1u, 1u, 1u, 0u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_S:
mixMask = BuildLpvMask(0u, 1u, 1u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_W:
mixMask = BuildLpvMask(1u, 0u, 1u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_INNER_S_E:
mixMask = BuildLpvMask(0u, 1u, 1u, 0u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_INNER_S_W:
mixMask = BuildLpvMask(0u, 0u, 1u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_INNER_N_W:
mixMask = BuildLpvMask(1u, 0u, 0u, 1u, 0u, 1u);
break;
case BLOCK_STAIRS_TOP_INNER_N_E:
mixMask = BuildLpvMask(1u, 1u, 0u, 0u, 0u, 1u);
break;
}
if (blockId >= BLOCK_STAIRS_TOP_OUTER_N_W && blockId <= BLOCK_STAIRS_TOP_OUTER_S_W) {
mixMask = BuildLpvMask(1u, 1u, 1u, 1u, 0u, 1u);
}
}
// WALL
if (blockId >= BLOCK_WALL_MIN && blockId <= BLOCK_WALL_MAX) {
mixWeight = 0.25;