diff --git a/assets/voxygen/shaders/terrain-frag.glsl b/assets/voxygen/shaders/terrain-frag.glsl index 35c9691390..474f9ddca4 100644 --- a/assets/voxygen/shaders/terrain-frag.glsl +++ b/assets/voxygen/shaders/terrain-frag.glsl @@ -272,7 +272,7 @@ void main() { max_light *= f_light; // TODO: Apply AO after this - vec3 glow = glow_light(f_pos) * (pow(f_glow, 6) * 5 + pow(f_glow, 1.5) * 2); + vec3 glow = glow_light(f_pos) * (pow(f_glow, 3) * 5 + pow(f_glow, 2.0) * 2); reflected_light += glow; max_light += lights_at(f_pos, f_norm, view_dir, mu, cam_attenuation, fluid_alt, k_a, k_d, k_s, alpha, f_norm, 1.0, emitted_light, reflected_light); diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index 6ab58c9e1d..8665c20ed2 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -178,7 +178,7 @@ impl Block { pub fn get_glow(&self) -> Option { match self.kind() { BlockKind::Lava => Some(24), - BlockKind::GlowingRock | BlockKind::GlowingWeakRock => Some(15), + BlockKind::GlowingRock | BlockKind::GlowingWeakRock => Some(10), BlockKind::GlowingMushroom => Some(20), _ => match self.get_sprite()? { SpriteKind::StreetLamp | SpriteKind::StreetLampTall => Some(24), diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs index 9b2536d7ac..0f023bb6bf 100644 --- a/world/src/layer/mod.rs +++ b/world/src/layer/mod.rs @@ -822,7 +822,7 @@ pub fn apply_caverns_to(canvas: &mut Canvas, dynamic_rng: &mut R) { .magnitude_squared() < 1.0f32 { - let kind = if dynamic_rng.gen_bool(0.01) { + let kind = if dynamic_rng.gen_bool(0.025) { BlockKind::GlowingRock } else { BlockKind::Leaves @@ -830,9 +830,9 @@ pub fn apply_caverns_to(canvas: &mut Canvas, dynamic_rng: &mut R) { Some(Block::new( kind, Rgb::new( - 0, + 85, (vine_y + vine_reach).mul(0.05).sin().mul(35.0).add(85.0) as u8, - 90, + 20, ), )) } else {