From 692fa3f28d0356bd1ada612640623e82077b8860 Mon Sep 17 00:00:00 2001
From: Joshua Barretto <joshua.s.barretto@gmail.com>
Date: Wed, 26 Jun 2019 11:18:45 +0100
Subject: [PATCH] Above-ground spawn point, better figure dt scaling

---
 server/src/lib.rs           | 2 +-
 voxygen/src/scene/figure.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/lib.rs b/server/src/lib.rs
index 747ef7f272..aa331e103b 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -83,7 +83,7 @@ impl Server {
         let mut state = State::new();
         state
             .ecs_mut()
-            .add_resource(SpawnPoint(Vec3::new(16_384.0, 16_384.0, 280.0)));
+            .add_resource(SpawnPoint(Vec3::new(16_384.0, 16_384.0, 305.0)));
 
         let this = Self {
             state,
diff --git a/voxygen/src/scene/figure.rs b/voxygen/src/scene/figure.rs
index 49eb0cbb7b..c2784a0673 100644
--- a/voxygen/src/scene/figure.rs
+++ b/voxygen/src/scene/figure.rs
@@ -766,8 +766,8 @@ impl<S: Skeleton> FigureState<S> {
         dt: f32,
     ) {
         // Update interpolate pos
-        self.pos = Lerp::lerp(self.pos, pos, (0.4f32).powf(1.0 / 60.0).powf(1.0 / dt));
-        self.ori = Slerp::slerp(self.ori, ori, (0.2f32).powf(1.0 / 60.0).powf(1.0 / dt));
+        self.pos = Lerp::lerp(self.pos, pos, (0.3f32).powf(1.0 / 60.0).powf(1.0 / dt));
+        self.ori = Slerp::slerp(self.ori, ori, (0.15f32).powf(1.0 / 60.0).powf(1.0 / dt));
 
         let mat = Mat4::<f32>::identity()
             * Mat4::translation_3d(self.pos)