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

misc fixes; better light colors

Browse Source
This commit is contained in:
NULL511
2024-05-03 11:39:21 -04:00
parent 81a937790c
commit 2c383a7720
7 changed files with 119 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shaders/dimensions/composite1.fsh
View File

@ -1268,8 +1268,13 @@ void main() {
#endif
#ifdef IS_LPV_ENABLED
// vec3 lpvPos = GetLpvPosition(feetPlayerPos) + 0.5*viewToWorld(FlatNormals);
vec3 lpvPos = GetLpvPosition(feetPlayerPos) - 0.5*viewToWorld(FlatNormals) + slopednormal;
vec3 lpvPos = GetLpvPosition(feetPlayerPos);
#ifdef LPV_NORMAL_OFFSET
lpvPos += -0.5*viewToWorld(FlatNormals) + slopednormal;
#else
lpvPos += 0.5*viewToWorld(FlatNormals);
#endif
#else
const vec3 lpvPos = vec3(0.0);
#endif

34
shaders/dimensions/setup.csh
View File

@ -6,6 +6,7 @@ const ivec3 workGroups = ivec3(4, 5, 1);
#include "/lib/blocks.glsl"
#include "/lib/lpv_blocks.glsl"
const vec3 LightColor_Amethyst = vec3(0.464, 0.227, 0.788);
const vec3 LightColor_Candles = vec3(1.0, 0.4, 0.1);
const vec3 LightColor_SeaPickle = vec3(0.283, 0.394, 0.212);
@ -27,6 +28,21 @@ void main() {
vec3 tintColor = vec3(1.0);
switch (blockId) {
case BLOCK_AMETHYST_BUD_LARGE:
lightColor = LightColor_Amethyst;
lightRange = 4.0;
mixWeight = 0.6;
break;
case BLOCK_AMETHYST_BUD_MEDIUM:
lightColor = LightColor_Amethyst;
lightRange = 2.0;
mixWeight = 0.8;
break;
case BLOCK_AMETHYST_CLUSTER:
lightColor = LightColor_Amethyst;
lightRange = 5.0;
mixWeight = 0.4;
break;
case BLOCK_BEACON:
lightColor = vec3(1.0);
lightRange = 15.0;
@ -52,7 +68,7 @@ void main() {
mixWeight = 1.0;
break;
case BLOCK_CAVE_VINE_BERRIES:
lightColor = vec3(0.717, 0.541, 0.188);
lightColor = vec3(0.651, 0.369, 0.157);
lightRange = 14.0;
mixWeight = 1.0;
break;
@ -60,6 +76,10 @@ void main() {
lightColor = vec3(1.0);
lightRange = 15.0;
break;
case BLOCK_CRYING_OBSIDIAN:
lightColor = vec3(0.390, 0.065, 0.646);
lightRange = 10.0;
break;
case BLOCK_END_GATEWAY:
lightColor = vec3(1.0);
lightRange = 15.0;
@ -85,21 +105,25 @@ void main() {
lightColor = vec3(0.463, 0.763, 0.409);
lightRange = 15.0;
break;
case BLOCK_GLOW_LICHEN:
lightColor = vec3(0.092, 0.217, 0.126);
lightRange = 7.0;
break;
case BLOCK_GLOWSTONE:
lightColor = vec3(0.747, 0.594, 0.326);
lightRange = 15.0;
break;
case BLOCK_JACK_O_LANTERN:
lightColor = vec3(1.0, 0.7, 0.1);
lightColor = vec3(0.864, 0.598, 0.348);
lightRange = 15.0;
break;
case BLOCK_LANTERN:
lightColor = vec3(1.0, 0.7, 0.1);
lightColor = vec3(0.839, 0.541, 0.2);
lightRange = 15.0;
mixWeight = 0.8;
break;
case BLOCK_LAVA:
lightColor = vec3(0.804, 0.424, 0.149);
lightColor = vec3(0.659, 0.302, 0.106);
lightRange = 15.0;
break;
case BLOCK_MAGMA:
@ -304,6 +328,8 @@ void main() {
break;
}
if (lightRange > 0.0) lightRange += 1.0;
LpvBlockData block;
block.ColorRange = packUnorm4x8(vec4(lightColor, lightRange/255.0));
block.MaskWeight = BuildBlockLpvData(mixMask, mixWeight);