From e461fbd9511ede5453f2e4366ac135f704da560a Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Sun, 22 Nov 2020 02:00:22 +0000 Subject: [PATCH] Make chimneys glow --- assets/voxygen/shaders/include/sky.glsl | 2 +- common/src/terrain/block.rs | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/voxygen/shaders/include/sky.glsl b/assets/voxygen/shaders/include/sky.glsl index 7dc8d9af1b..a65962c099 100644 --- a/assets/voxygen/shaders/include/sky.glsl +++ b/assets/voxygen/shaders/include/sky.glsl @@ -101,7 +101,7 @@ float cloud_shadow(vec3 pos, vec3 light_dir) { } float get_sun_brightness(/*vec3 sun_dir*/) { - return max(-sun_dir.z + 0.5, 0.0) * 0.9; + return max(-sun_dir.z + 0.5, 0.0); } float get_moon_brightness(/*vec3 moon_dir*/) { diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index 06729941f1..81b55a5195 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -168,8 +168,10 @@ impl Block { #[inline] pub fn get_glow(&self) -> Option { match self.get_sprite()? { - SpriteKind::StreetLamp | SpriteKind::StreetLampTall => Some(20), - SpriteKind::Velorite | SpriteKind::VeloriteFrag => Some(3), + SpriteKind::StreetLamp | SpriteKind::StreetLampTall => Some(24), + SpriteKind::Ember => Some(20), + SpriteKind::WallLamp => Some(16), + SpriteKind::Velorite | SpriteKind::VeloriteFrag => Some(6), _ => None, } }