From 215a09005e51904406b682d919a3332055b1db18 Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Sun, 21 Jul 2019 00:18:03 +0100 Subject: [PATCH] Only change entity orientation when on the ground --- .gitignore | 1 + common/src/sys/phys.rs | 4 ++-- voxygen/shaders/include/sky.glsl | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 153d29e4a5..2cb499d453 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ settings.ron run.sh screenshots +todo.txt diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs index 82579efaef..f687ffbdcd 100644 --- a/common/src/sys/phys.rs +++ b/common/src/sys/phys.rs @@ -141,8 +141,8 @@ impl<'a> System<'a> for Sys { } } - // Set direction based on velocity - if Vec2::::from(vel.0).magnitude_squared() > 0.1 { + // Set direction based on velocity when on the ground + if Vec2::::from(vel.0).magnitude_squared() > 0.1 && a.on_ground { ori.0 = Lerp::lerp( ori.0, vel.0.normalized() * Vec3::new(1.0, 1.0, 0.0), diff --git a/voxygen/shaders/include/sky.glsl b/voxygen/shaders/include/sky.glsl index 599cb10669..86c6dd4e00 100644 --- a/voxygen/shaders/include/sky.glsl +++ b/voxygen/shaders/include/sky.glsl @@ -139,8 +139,8 @@ vec3 get_sky_color(vec3 dir, float time_of_day) { float fog(vec2 f_pos, vec2 focus_pos) { float dist = distance(f_pos, focus_pos) / view_distance.x; - float min_fog = 0.75; + float min_fog = 0.5; float max_fog = 1.0; - return clamp((dist - min_fog) / (max_fog - min_fog), 0.0, 1.0); + return pow(clamp((dist - min_fog) / (max_fog - min_fog), 0.0, 1.0), 1.7); }