Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2025-06-20 07:57:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
NULL511 2024-05-04 00:55:01 -04:00
parent 43fe9e654a
commit 94ad32bd7f
8 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shaders/dimensions/setup.csh
View File

@ -1,6 +1,6 @@
layout (local_size_x = 8, local_size_y = 8, local_size_z = 1) in; layout (local_size_x = 8, local_size_y = 8, local_size_z = 1) in;
const ivec3 workGroups = ivec3(4, 5, 1); const ivec3 workGroups = ivec3(6, 6, 1);
#ifdef IS_LPV_ENABLED #ifdef IS_LPV_ENABLED
#include "/lib/blocks.glsl" #include "/lib/blocks.glsl"
@ -22,7 +22,7 @@ const ivec3 workGroups = ivec3(4, 5, 1);
void main() { void main() {
#ifdef IS_LPV_ENABLED #ifdef IS_LPV_ENABLED
uint blockId = uint(gl_GlobalInvocationID.x + gl_GlobalInvocationID.y * 32); uint blockId = uint(gl_GlobalInvocationID.x + gl_GlobalInvocationID.y * 32);
//if (blockId >= 1280) return; if (blockId >= 2000) return;
vec3 lightColor = vec3(0.0); vec3 lightColor = vec3(0.0);
float lightRange = 0.0; float lightRange = 0.0;
@ -107,7 +107,7 @@ void main() {
mixWeight = 1.0; mixWeight = 1.0;
break; break;
#ifdef LPV_REDSTONE #ifdef LPV_REDSTONE_LIGHTS
case BLOCK_COMPARATOR_LIT: case BLOCK_COMPARATOR_LIT:
lightColor = LightColor_RedstoneTorch; lightColor = LightColor_RedstoneTorch;
lightRange = 4.0; lightRange = 4.0;
@ -274,7 +274,7 @@ void main() {
lightRange = 7.0; lightRange = 7.0;
break; break;
#ifdef LPV_REDSTONE #ifdef LPV_REDSTONE_LIGHTS
case BLOCK_REDSTONE_WIRE_1: case BLOCK_REDSTONE_WIRE_1:
lightColor = LightColor_RedstoneTorch; lightColor = LightColor_RedstoneTorch;
lightRange = 0.5; lightRange = 0.5;

8
shaders/entity.properties
View File

@ -1,9 +1,9 @@
entity.1201= player entity.1201= player
entity.1202 = minecraft:lightning_bolt weather2:lightning_bolt entity.1202= minecraft:lightning_bolt weather2:lightning_bolt
## misc stuff ## misc stuff
entity.1203 = ender_dragon wither entity.1203= ender_dragon wither
entity.1301= item_frame item_display entity.1301= item_frame item_display
entity.1302= spectral_arrow bigglobe:torch_arrow entity.1302= spectral_arrow bigglobe:torch_arrow
@ -14,7 +14,7 @@ entity.1303= tnt firework_rocket
###### ######
## medium sss (same as strong sss for blocks) ## medium sss (same as strong sss for blocks)
entity.1401 = slime giant ghast elder_guardian entity.1401= slime giant ghast elder_guardian
## weak sss (same as weak sss for blocks) ## weak sss (same as weak sss for blocks)
entity.1402 = sheep frog chicken snow_golem polar_bear zombie_horse armor_stand arrow squid bat cat cod cow donkey fox horse mooshroom mule ocelot parrot pig piglin polar_bear pufferfish rabbit salmon strider tropical_fish turtle villager wandering_trader bee cave_spider dolphin enderman llama panda spider wolf zombified_piglin blaze creeper drowned endermite evoker guardian hoglin husk magma_cube phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager trader_llama entity.1402= sheep frog chicken snow_golem polar_bear zombie_horse armor_stand arrow squid bat cat cod cow donkey fox horse mooshroom mule ocelot parrot pig piglin polar_bear pufferfish rabbit salmon strider tropical_fish turtle villager wandering_trader bee cave_spider dolphin enderman llama panda spider wolf zombified_piglin blaze creeper drowned endermite evoker guardian hoglin husk magma_cube phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager trader_llama

4
shaders/lang/en_us.lang
View File

@ -78,8 +78,10 @@ screen.Direct_Light = Direct Light
value.LPV_SIZE.6 = Small [64] value.LPV_SIZE.6 = Small [64]
value.LPV_SIZE.7 = Medium [128] value.LPV_SIZE.7 = Medium [128]
value.LPV_SIZE.8 = Large [256] value.LPV_SIZE.8 = Large [256]
option.LPV_ENTITY_LIGHTS = Entity Lights
option.LPV_NORMAL_OFFSET = Normal-Offset option.LPV_NORMAL_OFFSET = Normal-Offset
option.LPV_ENTITY_LIGHTS = Entity Lights
option.LPV_REDSTONE_LIGHTS = Redstone Lights
option.LPV_COLORED_CANDLES = Colored Candles
screen.Subsurface_Scattering = Sub-Surface Scattering screen.Subsurface_Scattering = Sub-Surface Scattering

2
shaders/lib/entities.glsl
View File

@ -1,6 +1,6 @@
#define ENTITY_PLAYER 1201 #define ENTITY_PLAYER 1201
#define ENTITY_LIGHTNING 1202 #define ENTITY_LIGHTNING 1202
//#define ENTITY_DRAGON_WITH 1203 //#define ENTITY_DRAGON_WITHER 1203
#define ENTITY_ITEM_FRAME 1301 #define ENTITY_ITEM_FRAME 1301
#define ENTITY_SPECTRAL_ARROW 1302 #define ENTITY_SPECTRAL_ARROW 1302

2
shaders/lib/lpv_blocks.glsl
View File

@ -1,4 +1,4 @@
struct LpvBlockData { // 12 x1280 =? struct LpvBlockData { // 12 x2000 =?
uint MaskWeight; // 4 uint MaskWeight; // 4
uint ColorRange; // 4 uint ColorRange; // 4
uint Tint; // 4 uint Tint; // 4

5
shaders/lib/settings.glsl
View File

@ -675,9 +675,10 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631)
//#define LPV_ENABLED //#define LPV_ENABLED
#define LPV_SIZE 7 // [6 7 8] #define LPV_SIZE 7 // [6 7 8]
#define LPV_ENTITY_LIGHTS
#define LPV_NORMAL_OFFSET #define LPV_NORMAL_OFFSET
#define LPV_REDSTONE #define LPV_ENTITY_LIGHTS
#define LPV_REDSTONE_LIGHTS
#define LPV_COLORED_CANDLES
#ifdef LPV_ENABLED #ifdef LPV_ENABLED
#ifdef IRIS_FEATURE_CUSTOM_IMAGES #ifdef IRIS_FEATURE_CUSTOM_IMAGES

14
shaders/shaders.properties
View File

@ -623,20 +623,20 @@ uniform.float.shadowMaxProj = 150.0/abs(sunPosY)
# if defined LPV_ENABLED && defined IRIS_FEATURE_CUSTOM_IMAGES # if defined LPV_ENABLED && defined IRIS_FEATURE_CUSTOM_IMAGES
#ifdef LPV_ENABLED #ifdef LPV_ENABLED
bufferObject.0=204800 bufferObject.0=32000
#if LPV_SIZE == 8 #if LPV_SIZE == 8
image.imgVoxelMask = none RED_INTEGER R16UI UNSIGNED_SHORT true false 256 256 256 image.imgVoxelMask = none RED_INTEGER R16UI UNSIGNED_SHORT true false 256 256 256
image.imgLpv1 = none RGBA RGBA8 BYTE false false 256 256 256 image.imgLpv1 = none RGB RGBA8 BYTE false false 256 256 256
image.imgLpv2 = none RGBA RGBA8 BYTE false false 256 256 256 image.imgLpv2 = none RGB RGBA8 BYTE false false 256 256 256
#elif LPV_SIZE == 7 #elif LPV_SIZE == 7
image.imgVoxelMask = none RED_INTEGER R16UI UNSIGNED_SHORT true false 128 128 128 image.imgVoxelMask = none RED_INTEGER R16UI UNSIGNED_SHORT true false 128 128 128
image.imgLpv1 = none RGBA RGBA8 BYTE false false 128 128 128 image.imgLpv1 = none RGB RGBA8 BYTE false false 128 128 128
image.imgLpv2 = none RGBA RGBA8 BYTE false false 128 128 128 image.imgLpv2 = none RGB RGBA8 BYTE false false 128 128 128
#elif LPV_SIZE == 6 #elif LPV_SIZE == 6
image.imgVoxelMask = none RED_INTEGER R16UI UNSIGNED_SHORT true false 64 64 64 image.imgVoxelMask = none RED_INTEGER R16UI UNSIGNED_SHORT true false 64 64 64
image.imgLpv1 = none RGBA RGBA8 BYTE false false 64 64 64 image.imgLpv1 = none RGB RGBA8 BYTE false false 64 64 64
image.imgLpv2 = none RGBA RGBA8 BYTE false false 64 64 64 image.imgLpv2 = none RGB RGBA8 BYTE false false 64 64 64
#endif #endif
#else #else
program.world1/setup.enabled = false program.world1/setup.enabled = false

9
shaders/world0/shadow.vsh
View File

@ -215,9 +215,12 @@ void main() {
voxelId = uint(currentRenderedItemId); voxelId = uint(currentRenderedItemId);
} }
else { else {
// TODO: set from entityId switch (entityId) {
if (entityId == ENTITY_SPECTRAL_ARROW) case ENTITY_SPECTRAL_ARROW:
voxelId = uint(BLOCK_TORCH); voxelId = uint(BLOCK_TORCH);
break;
// TODO: blaze, magma_cube
} }
if (voxelId > 0u) if (voxelId > 0u)