From dc8a331f55a61ff420ba427ad005c609a4f986a4 Mon Sep 17 00:00:00 2001 From: NULL511 Date: Wed, 8 May 2024 12:26:37 -0400 Subject: [PATCH] misc floodfill fixes --- shaders/dimensions/composite1.fsh | 1 - shaders/dimensions/setup.csh | 6 +++++- shaders/entity.properties | 4 +++- shaders/lib/entities.glsl | 3 ++- shaders/lib/settings.glsl | 3 ++- shaders/template/entity.properties | 3 +++ shaders/world-1/shadow.vsh | 3 +++ shaders/world0/shadow.vsh | 3 +++ shaders/world1/shadow.vsh | 3 +++ 9 files changed, 24 insertions(+), 5 deletions(-) diff --git a/shaders/dimensions/composite1.fsh b/shaders/dimensions/composite1.fsh index a38a627..554770e 100644 --- a/shaders/dimensions/composite1.fsh +++ b/shaders/dimensions/composite1.fsh @@ -173,7 +173,6 @@ vec3 toScreenSpace(vec3 p) { #ifdef IS_LPV_ENABLED #include "/lib/hsv.glsl" #include "/lib/lpv_common.glsl" - // #include "/lib/lpv_blocks.glsl" #include "/lib/lpv_render.glsl" #endif diff --git a/shaders/dimensions/setup.csh b/shaders/dimensions/setup.csh index cd85c89..1fb6e8e 100644 --- a/shaders/dimensions/setup.csh +++ b/shaders/dimensions/setup.csh @@ -1007,6 +1007,11 @@ void main() { lightRange = 8.0; } + if (blockId == ENTITY_FIREBALL_SMALL) { + lightColor = vec3(0.000, 1.000, 0.000); + lightRange = 8.0; + } + if (blockId == ENTITY_MAGMA_CUBE) { lightColor = vec3(0.747, 0.323, 0.110); lightRange = 9.0; @@ -1032,7 +1037,6 @@ void main() { uint lightColorRange = packUnorm4x8(vec4(lightColor, lightRange/255.0)); uint tintColorMask = packUnorm4x8(vec4(tintColor, 0.0)); - tintColorMask |= mixMask << 24; imageStore(imgBlockData, blockId, uvec4(lightColorRange, tintColorMask, 0u, 0u)); diff --git a/shaders/entity.properties b/shaders/entity.properties index 6587c74..1f43d40 100644 --- a/shaders/entity.properties +++ b/shaders/entity.properties @@ -16,7 +16,9 @@ entity.1607=magma_cube 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 diff --git a/shaders/lib/entities.glsl b/shaders/lib/entities.glsl index 0300ffb..c2e407d 100644 --- a/shaders/lib/entities.glsl +++ b/shaders/lib/entities.glsl @@ -6,7 +6,8 @@ #define ENTITY_ITEM_FRAME 1606 #define ENTITY_MAGMA_CUBE 1607 #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_WEAK 1802 #define ENTITY_SLIME 1803 diff --git a/shaders/lib/settings.glsl b/shaders/lib/settings.glsl index 1922735..2c62a7e 100644 --- a/shaders/lib/settings.glsl +++ b/shaders/lib/settings.glsl @@ -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_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 IRIS_FEATURE_CUSTOM_IMAGES diff --git a/shaders/template/entity.properties b/shaders/template/entity.properties index 42c3f70..9af3ec1 100644 --- a/shaders/template/entity.properties +++ b/shaders/template/entity.properties @@ -24,6 +24,9 @@ entity.*= magma_cube #= ENTITY_TNT entity.*= tnt firework_rocket +#= ENTITY_FIREBALL_SMALL +entity.*= small_fireball + #= ENTITY_SPECTRAL_ARROW entity.*= spectral_arrow bigglobe:torch_arrow diff --git a/shaders/world-1/shadow.vsh b/shaders/world-1/shadow.vsh index b5ccc56..951c796 100644 --- a/shaders/world-1/shadow.vsh +++ b/shaders/world-1/shadow.vsh @@ -70,8 +70,11 @@ void main() { else { switch (entityId) { case ENTITY_BLAZE: + case ENTITY_END_CRYSTAL: + // case ENTITY_FIREBALL_SMALL: case ENTITY_MAGMA_CUBE: case ENTITY_SPECTRAL_ARROW: + case ENTITY_TNT: voxelId = uint(entityId); break; } diff --git a/shaders/world0/shadow.vsh b/shaders/world0/shadow.vsh index 94b6844..8f30f3e 100644 --- a/shaders/world0/shadow.vsh +++ b/shaders/world0/shadow.vsh @@ -219,8 +219,11 @@ void main() { else { switch (entityId) { case ENTITY_BLAZE: + case ENTITY_END_CRYSTAL: + // case ENTITY_FIREBALL_SMALL: case ENTITY_MAGMA_CUBE: case ENTITY_SPECTRAL_ARROW: + case ENTITY_TNT: voxelId = uint(entityId); break; } diff --git a/shaders/world1/shadow.vsh b/shaders/world1/shadow.vsh index b5ccc56..951c796 100644 --- a/shaders/world1/shadow.vsh +++ b/shaders/world1/shadow.vsh @@ -70,8 +70,11 @@ void main() { else { switch (entityId) { case ENTITY_BLAZE: + case ENTITY_END_CRYSTAL: + // case ENTITY_FIREBALL_SMALL: case ENTITY_MAGMA_CUBE: case ENTITY_SPECTRAL_ARROW: + case ENTITY_TNT: voxelId = uint(entityId); break; }