Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2025-01-03 16:13:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

misc floodfill fixes

Browse Source
This commit is contained in:
NULL511 2024-05-08 12:26:37 -04:00
parent 8c8531701b
commit dc8a331f55
9 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
shaders/dimensions/composite1.fsh
View File

@ -173,7 +173,6 @@ vec3 toScreenSpace(vec3 p) {
#ifdef IS_LPV_ENABLED #ifdef IS_LPV_ENABLED
#include "/lib/hsv.glsl" #include "/lib/hsv.glsl"
#include "/lib/lpv_common.glsl" #include "/lib/lpv_common.glsl"
// #include "/lib/lpv_blocks.glsl"
#include "/lib/lpv_render.glsl" #include "/lib/lpv_render.glsl"
#endif #endif

6
shaders/dimensions/setup.csh
View File

@ -1007,6 +1007,11 @@ void main() {
lightRange = 8.0; lightRange = 8.0;
} }
if (blockId == ENTITY_FIREBALL_SMALL) {
lightColor = vec3(0.000, 1.000, 0.000);
lightRange = 8.0;
}
if (blockId == ENTITY_MAGMA_CUBE) { if (blockId == ENTITY_MAGMA_CUBE) {
lightColor = vec3(0.747, 0.323, 0.110); lightColor = vec3(0.747, 0.323, 0.110);
lightRange = 9.0; lightRange = 9.0;
@ -1032,7 +1037,6 @@ void main() {
uint lightColorRange = packUnorm4x8(vec4(lightColor, lightRange/255.0)); uint lightColorRange = packUnorm4x8(vec4(lightColor, lightRange/255.0));
uint tintColorMask = packUnorm4x8(vec4(tintColor, 0.0)); uint tintColorMask = packUnorm4x8(vec4(tintColor, 0.0));
tintColorMask |= mixMask << 24; tintColorMask |= mixMask << 24;
imageStore(imgBlockData, blockId, uvec4(lightColorRange, tintColorMask, 0u, 0u)); imageStore(imgBlockData, blockId, uvec4(lightColorRange, tintColorMask, 0u, 0u));

4
shaders/entity.properties
View File

@ -16,7 +16,9 @@ entity.1607=magma_cube
entity.1608=tnt firework_rocket entity.1608=tnt firework_rocket
entity.1609=spectral_arrow bigglobe:torch_arrow entity.1609=small_fireball
entity.1610=spectral_arrow bigglobe:torch_arrow
################################################ ################################################
###### SUB-SURFACE SCATTERING ###### SUB-SURFACE SCATTERING

3
shaders/lib/entities.glsl
View File

@ -6,7 +6,8 @@
#define ENTITY_ITEM_FRAME 1606 #define ENTITY_ITEM_FRAME 1606
#define ENTITY_MAGMA_CUBE 1607 #define ENTITY_MAGMA_CUBE 1607
#define ENTITY_TNT 1608 #define ENTITY_TNT 1608
#define ENTITY_SPECTRAL_ARROW 1609 #define ENTITY_FIREBALL_SMALL 1609
#define ENTITY_SPECTRAL_ARROW 1610
#define ENTITY_SSS_MEDIUM 1801 #define ENTITY_SSS_MEDIUM 1801
#define ENTITY_SSS_WEAK 1802 #define ENTITY_SSS_WEAK 1802
#define ENTITY_SLIME 1803 #define ENTITY_SLIME 1803

3
shaders/lib/settings.glsl
View File

@ -687,7 +687,8 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631)
#define LPV_REDSTONE_LIGHTS #define LPV_REDSTONE_LIGHTS
//#define LPV_COLORED_CANDLES //#define LPV_COLORED_CANDLES
// #define LPV_NOSHADOW_HACK // Fix for making nether/end work until next Iris release to fix shadow matrices
#define LPV_NOSHADOW_HACK
#ifdef LPV_ENABLED #ifdef LPV_ENABLED
#ifdef IRIS_FEATURE_CUSTOM_IMAGES #ifdef IRIS_FEATURE_CUSTOM_IMAGES

3
shaders/template/entity.properties
View File

@ -24,6 +24,9 @@ entity.*= magma_cube
#= ENTITY_TNT #= ENTITY_TNT
entity.*= tnt firework_rocket entity.*= tnt firework_rocket
#= ENTITY_FIREBALL_SMALL
entity.*= small_fireball
#= ENTITY_SPECTRAL_ARROW #= ENTITY_SPECTRAL_ARROW
entity.*= spectral_arrow bigglobe:torch_arrow entity.*= spectral_arrow bigglobe:torch_arrow

3
shaders/world-1/shadow.vsh
View File

@ -70,8 +70,11 @@ void main() {
else { else {
switch (entityId) { switch (entityId) {
case ENTITY_BLAZE: case ENTITY_BLAZE:
case ENTITY_END_CRYSTAL:
// case ENTITY_FIREBALL_SMALL:
case ENTITY_MAGMA_CUBE: case ENTITY_MAGMA_CUBE:
case ENTITY_SPECTRAL_ARROW: case ENTITY_SPECTRAL_ARROW:
case ENTITY_TNT:
voxelId = uint(entityId); voxelId = uint(entityId);
break; break;
} }

3
shaders/world0/shadow.vsh
View File

@ -219,8 +219,11 @@ void main() {
else { else {
switch (entityId) { switch (entityId) {
case ENTITY_BLAZE: case ENTITY_BLAZE:
case ENTITY_END_CRYSTAL:
// case ENTITY_FIREBALL_SMALL:
case ENTITY_MAGMA_CUBE: case ENTITY_MAGMA_CUBE:
case ENTITY_SPECTRAL_ARROW: case ENTITY_SPECTRAL_ARROW:
case ENTITY_TNT:
voxelId = uint(entityId); voxelId = uint(entityId);
break; break;
} }

3
shaders/world1/shadow.vsh
View File

@ -70,8 +70,11 @@ void main() {
else { else {
switch (entityId) { switch (entityId) {
case ENTITY_BLAZE: case ENTITY_BLAZE:
case ENTITY_END_CRYSTAL:
// case ENTITY_FIREBALL_SMALL:
case ENTITY_MAGMA_CUBE: case ENTITY_MAGMA_CUBE:
case ENTITY_SPECTRAL_ARROW: case ENTITY_SPECTRAL_ARROW:
case ENTITY_TNT:
voxelId = uint(entityId); voxelId = uint(entityId);
break; break;
} }