Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2024-12-22 09:38:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #175 from Null-MC/floodfill.fixes

Browse Source 
FloodFill Fixes
This commit is contained in:
Xonk 2024-06-10 23:45:19 -04:00 committed by GitHub
commit e94617304c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shaders/lang/en_us.lang
View File

@ -106,6 +106,7 @@ screen.Direct_Light = Direct Light
option.LPV_ENTITY_LIGHTS = Entity Lights
option.LPV_REDSTONE_LIGHTS = Redstone Lights
option.LPV_COLORED_CANDLES = Colored Candles
option.LPV_NOSHADOW_HACK = Iris <= 1.7.0 Fix
screen.Subsurface_Scattering = Sub-Surface Scattering
option.LabSSS_Curve = LabSSS Curve
@ -547,6 +548,7 @@ screen.Ambient_light.comment = Configure settings related to the lighting in sha
option.LPV_ENTITY_LIGHTS.comment = Allows entities to contribute to colored lighting.
option.LPV_REDSTONE_LIGHTS.comment = Allows redstone blocks to contribute to colored lighting.
option.LPV_COLORED_CANDLES.comment = Allows colored candles to emit matching colored lighting.
option.LPV_NOSHADOW_HACK.comment = Fix for Iris 1.7.0 and lower! Allows floodfill to work in Nether & End, but disables entity & dropped item lights.
screen.Resource_Pack_Support.comment = A handfull of effects that use information provided by a resourcepack.
screen.Reflections.comment = Configure the reflections that use information provided by a LabPBR resourcepack.

6
shaders/lib/settings.glsl
View File

@ -725,11 +725,13 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631)
//#define LPV_COLORED_CANDLES
// Fix for making nether/end work until next Iris release to fix shadow matrices
//#define LPV_NOSHADOW_HACK
#define LPV_NOSHADOW_HACK
#ifdef LPV_ENABLED
#ifdef IRIS_FEATURE_CUSTOM_IMAGES
#define IS_LPV_ENABLED
const float voxelDistance = 64.0;
#endif
#endif
@ -784,4 +786,4 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631)
#ifdef PARTICLE_RENDERING_FIX
#endif
#ifdef RENDER_PLAYER_SHADOWS
#endif
#endif

2
shaders/lib/voxel_common.glsl
View File

@ -7,6 +7,4 @@
const uint VoxelSize = uint(exp2(LPV_SIZE));
const uvec3 VoxelSize3 = uvec3(VoxelSize);
const float voxelDistance = 64.0;
#define BLOCK_EMPTY 0

4
shaders/shaders.properties
View File

@ -185,8 +185,8 @@ BLISS_SHADERS <empty> \
### FloodFill
screen.LPV.columns = 1
screen.LPV = LPV_ENABLED LPV_SIZE LPV_SATURATION LPV_NORMAL_STRENGTH LPV_ENTITY_LIGHTS LPV_REDSTONE_LIGHTS LPV_COLORED_CANDLES
screen.LPV = LPV_ENABLED LPV_SIZE LPV_SATURATION LPV_NORMAL_STRENGTH LPV_ENTITY_LIGHTS LPV_REDSTONE_LIGHTS LPV_COLORED_CANDLES LPV_NOSHADOW_HACK
######## WORLD
screen.World.columns=1
screen.World = [Water] [Waving_Stuff] [Sky_coefficients] SKY_GROUND <empty> AEROCHROME_MODE AEROCHROME_PINKNESS AEROCHROME_WOOL_ENABLED