From da7c3020a23940ea854b8eae5066ad0ab09506bf Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Sun, 4 Aug 2019 15:30:45 +0100 Subject: [PATCH 1/2] Stopped stars appearing in the day --- voxygen/shaders/include/sky.glsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/voxygen/shaders/include/sky.glsl b/voxygen/shaders/include/sky.glsl index fcc627ac22..cc5ac25a1b 100644 --- a/voxygen/shaders/include/sky.glsl +++ b/voxygen/shaders/include/sky.glsl @@ -97,12 +97,12 @@ vec3 get_sky_color(vec3 dir, float time_of_day) { vec3 sky_top = mix( mix( SKY_DUSK_TOP, - SKY_NIGHT_TOP, + SKY_NIGHT_TOP + star, max(sun_dir.z, 0) ), SKY_DAY_TOP, max(-sun_dir.z, 0) - ) + star; + ); vec3 sky_mid = mix( mix( From a82ae863f32abd5ef3ffad30104e48a6085b0efc Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Sun, 4 Aug 2019 15:51:17 +0100 Subject: [PATCH 2/2] Improved orientation slerping --- common/src/sys/movement.rs | 6 +++++- voxygen/shaders/include/sky.glsl | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/src/sys/movement.rs b/common/src/sys/movement.rs index 18f4dfb219..8938510380 100644 --- a/common/src/sys/movement.rs +++ b/common/src/sys/movement.rs @@ -120,7 +120,11 @@ impl<'a> System<'a> for Sys { && (ori.0.normalized() - Vec3::from(ori_dir).normalized()).magnitude_squared() > 0.001 { - ori.0 = vek::ops::Slerp::slerp(ori.0, ori_dir.into(), 15.0 * dt.0); + ori.0 = vek::ops::Slerp::slerp( + ori.0, + ori_dir.into(), + if a.on_ground { 12.0 } else { 2.0 } * dt.0, + ); } } diff --git a/voxygen/shaders/include/sky.glsl b/voxygen/shaders/include/sky.glsl index cc5ac25a1b..ead35e97be 100644 --- a/voxygen/shaders/include/sky.glsl +++ b/voxygen/shaders/include/sky.glsl @@ -96,7 +96,7 @@ vec3 get_sky_color(vec3 dir, float time_of_day) { vec3 sky_top = mix( mix( - SKY_DUSK_TOP, + SKY_DUSK_TOP + star, SKY_NIGHT_TOP + star, max(sun_dir.z, 0) ),