From d60e25c622e61cb94acbc731f28e1a4a792a97c3 Mon Sep 17 00:00:00 2001 From: NULL511 Date: Thu, 13 Jun 2024 23:35:32 -0400 Subject: [PATCH] candle color fix --- shaders/dimensions/setup.csh | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/shaders/dimensions/setup.csh b/shaders/dimensions/setup.csh index 904ec8e..cf49b4f 100644 --- a/shaders/dimensions/setup.csh +++ b/shaders/dimensions/setup.csh @@ -15,24 +15,22 @@ const ivec3 workGroups = ivec3(6, 6, 1); const vec3 LightColor_RedstoneTorch = vec3(0.939, 0.305, 0.164); const vec3 LightColor_SeaPickle = vec3(0.283, 0.394, 0.212); - #ifdef LPV_COLORED_CANDLES - const vec3 LightColor_Candles_Black = vec3(0.200); - const vec3 LightColor_Candles_Blue = vec3(0.000, 0.259, 1.000); - const vec3 LightColor_Candles_Brown = vec3(0.459, 0.263, 0.149); - const vec3 LightColor_Candles_Cyan = vec3(0.000, 0.839, 0.839); - const vec3 LightColor_Candles_Gray = vec3(0.329, 0.357, 0.388); - const vec3 LightColor_Candles_Green = vec3(0.263, 0.451, 0.000); - const vec3 LightColor_Candles_LightBlue = vec3(0.153, 0.686, 1.000); - const vec3 LightColor_Candles_LightGray = vec3(0.631, 0.627, 0.624); - const vec3 LightColor_Candles_Lime = vec3(0.439, 0.890, 0.000); - const vec3 LightColor_Candles_Magenta = vec3(0.757, 0.098, 0.812); - const vec3 LightColor_Candles_Orange = vec3(1.000, 0.459, 0.000); - const vec3 LightColor_Candles_Pink = vec3(1.000, 0.553, 0.718); - const vec3 LightColor_Candles_Purple = vec3(0.569, 0.000, 1.000); - const vec3 LightColor_Candles_Red = vec3(0.859, 0.000, 0.000); - const vec3 LightColor_Candles_White = vec3(1.000); - const vec3 LightColor_Candles_Yellow = vec3(1.000, 0.878, 0.000); - #endif + const vec3 LightColor_Candles_Black = vec3(0.200); + const vec3 LightColor_Candles_Blue = vec3(0.000, 0.259, 1.000); + const vec3 LightColor_Candles_Brown = vec3(0.459, 0.263, 0.149); + const vec3 LightColor_Candles_Cyan = vec3(0.000, 0.839, 0.839); + const vec3 LightColor_Candles_Gray = vec3(0.329, 0.357, 0.388); + const vec3 LightColor_Candles_Green = vec3(0.263, 0.451, 0.000); + const vec3 LightColor_Candles_LightBlue = vec3(0.153, 0.686, 1.000); + const vec3 LightColor_Candles_LightGray = vec3(0.631, 0.627, 0.624); + const vec3 LightColor_Candles_Lime = vec3(0.439, 0.890, 0.000); + const vec3 LightColor_Candles_Magenta = vec3(0.757, 0.098, 0.812); + const vec3 LightColor_Candles_Orange = vec3(1.000, 0.459, 0.000); + const vec3 LightColor_Candles_Pink = vec3(1.000, 0.553, 0.718); + const vec3 LightColor_Candles_Purple = vec3(0.569, 0.000, 1.000); + const vec3 LightColor_Candles_Red = vec3(0.859, 0.000, 0.000); + const vec3 LightColor_Candles_White = vec3(1.000); + const vec3 LightColor_Candles_Yellow = vec3(1.000, 0.878, 0.000); uint BuildLpvMask(const in uint north, const in uint east, const in uint south, const in uint west, const in uint up, const in uint down) { return east | (west << 1) | (down << 2) | (up << 3) | (south << 4) | (north << 5);