misc fixes; better light colors

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

View File

@ -2,39 +2,44 @@
#define BLOCK_WATER 8
#define BLOCK_BEACON 1001
#define BLOCK_CANDLES_LIT_1 1002
#define BLOCK_CANDLES_LIT_2 1003
#define BLOCK_CANDLES_LIT_3 1004
#define BLOCK_CANDLES_LIT_4 1005
#define BLOCK_CAVE_VINE_BERRIES 1006
#define BLOCK_CONDUIT 1007
#define BLOCK_END_GATEWAY 1008
#define BLOCK_END_ROD 1009
#define BLOCK_FIRE 1010
#define BLOCK_FROGLIGHT_OCHRE 1011
#define BLOCK_FROGLIGHT_PEARLESCENT 1012
#define BLOCK_FROGLIGHT_VERDANT 1013
#define BLOCK_GLOWSTONE 1014
#define BLOCK_JACK_O_LANTERN 1015
#define BLOCK_LANTERN 1016
#define BLOCK_LAVA 1017
#define BLOCK_MAGMA 1018
#define BLOCK_REDSTONE_LAMP_LIT 1019
#define BLOCK_REDSTONE_TORCH_LIT 1020
#define BLOCK_RESPAWN_ANCHOR_4 1021
#define BLOCK_SCULK_SENSOR_ACTIVE 1022
#define BLOCK_SEA_PICKLE_WET_1 1023
#define BLOCK_SEA_PICKLE_WET_2 1024
#define BLOCK_SEA_PICKLE_WET_3 1025
#define BLOCK_SEA_PICKLE_WET_4 1026
#define BLOCK_SEA_LANTERN 1027
#define BLOCK_SHROOMLIGHT 1028
#define BLOCK_SMOKER_LIT 1029
#define BLOCK_SOUL_FIRE 1030
#define BLOCK_SOUL_LANTERN 1031
#define BLOCK_SOUL_TORCH 1032
#define BLOCK_TORCH 1033
#define BLOCK_AMETHYST_BUD_LARGE 1001
#define BLOCK_AMETHYST_BUD_MEDIUM 1002
#define BLOCK_AMETHYST_CLUSTER 1003
#define BLOCK_BEACON 1004
#define BLOCK_CANDLES_LIT_1 1005
#define BLOCK_CANDLES_LIT_2 1006
#define BLOCK_CANDLES_LIT_3 1007
#define BLOCK_CANDLES_LIT_4 1008
#define BLOCK_CAVE_VINE_BERRIES 1009
#define BLOCK_CONDUIT 1010
#define BLOCK_CRYING_OBSIDIAN 1011
#define BLOCK_END_GATEWAY 1012
#define BLOCK_END_ROD 1013
#define BLOCK_FIRE 1014
#define BLOCK_FROGLIGHT_OCHRE 1015
#define BLOCK_FROGLIGHT_PEARLESCENT 1016
#define BLOCK_FROGLIGHT_VERDANT 1017
#define BLOCK_GLOW_LICHEN 1018
#define BLOCK_GLOWSTONE 1019
#define BLOCK_JACK_O_LANTERN 1020
#define BLOCK_LANTERN 1021
#define BLOCK_LAVA 1022
#define BLOCK_MAGMA 1023
#define BLOCK_REDSTONE_LAMP_LIT 1024
#define BLOCK_REDSTONE_TORCH_LIT 1025
#define BLOCK_RESPAWN_ANCHOR_4 1026
#define BLOCK_SCULK_SENSOR_ACTIVE 1027
#define BLOCK_SEA_PICKLE_WET_1 1028
#define BLOCK_SEA_PICKLE_WET_2 1029
#define BLOCK_SEA_PICKLE_WET_3 1030
#define BLOCK_SEA_PICKLE_WET_4 1031
#define BLOCK_SEA_LANTERN 1032
#define BLOCK_SHROOMLIGHT 1033
#define BLOCK_SMOKER_LIT 1034
#define BLOCK_SOUL_FIRE 1035
#define BLOCK_SOUL_LANTERN 1036
#define BLOCK_SOUL_TORCH 1037
#define BLOCK_TORCH 1038
#define BLOCK_GLASS 1201
#define BLOCK_HONEY 1202

View File

@ -1,8 +1,8 @@
// LPV falloff curve
const float LpvBlockPower = 4.0;
const float LpvBlockPower = 5.0;
// LPV block brightness scale
const float LpvBlockBrightness = 3.0;
const float LpvBlockBrightness = 2.0;
vec4 SampleLpvNearest(const in ivec3 lpvPos) {

View File

@ -674,6 +674,7 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631)
///////////////////////////////////////////
//#define LPV_ENABLED
#define LPV_NORMAL_OFFSET
#define LPV_SIZE 7 // [6 7 8]
#ifdef LPV_ENABLED