From deadd665c87563a3aa2e80987f3822becb50db5c Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Sat, 12 Oct 2019 14:19:55 -0400
Subject: [PATCH] tweaks animations to better align with true positions

---
 voxygen/src/anim/character/jump.rs  | 2 +-
 voxygen/src/anim/character/roll.rs  | 4 ++--
 voxygen/src/anim/character/run.rs   | 2 +-
 voxygen/src/anim/character/stand.rs | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/voxygen/src/anim/character/jump.rs b/voxygen/src/anim/character/jump.rs
index 72f20e6565..b1cff186c0 100644
--- a/voxygen/src/anim/character/jump.rs
+++ b/voxygen/src/anim/character/jump.rs
@@ -90,7 +90,7 @@ impl Animation for JumpAnimation {
         next.draw.ori = Quaternion::rotation_y(0.0);
         next.draw.scale = Vec3::one() * 0.0;
 
-        next.torso.offset = Vec3::new(0.0, -0.2, 0.0) * skeleton_attr.scaler;
+        next.torso.offset = Vec3::new(0.0, 0.0, 0.0) * skeleton_attr.scaler;
         next.torso.ori = Quaternion::rotation_x(-0.2);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
 
diff --git a/voxygen/src/anim/character/roll.rs b/voxygen/src/anim/character/roll.rs
index ab9e5bd3bb..2811f7af1c 100644
--- a/voxygen/src/anim/character/roll.rs
+++ b/voxygen/src/anim/character/roll.rs
@@ -96,8 +96,8 @@ impl Animation for RollAnimation {
         next.draw.scale = Vec3::one() * 0.0;
 
         next.torso.offset =
-            Vec3::new(0.0, -2.2, 0.1 + wave_dub * 16.0) / 11.0 * skeleton_attr.scaler;
-        next.torso.ori = Quaternion::rotation_x(wave_slow * 6.0);
+            Vec3::new(0.0, 11.0, 0.1 + wave_dub * 16.0) / 11.0 * skeleton_attr.scaler;
+        next.torso.ori = Quaternion::rotation_x(wave_slow * 6.5);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;
         next
     }
diff --git a/voxygen/src/anim/character/run.rs b/voxygen/src/anim/character/run.rs
index e728f03123..255e5a0fcf 100644
--- a/voxygen/src/anim/character/run.rs
+++ b/voxygen/src/anim/character/run.rs
@@ -136,7 +136,7 @@ impl Animation for RunAnimation {
         next.draw.ori = Quaternion::rotation_y(0.0);
         next.draw.scale = Vec3::one() * 0.0;
 
-        next.torso.offset = Vec3::new(0.0, -0.2 + wave * -0.08, 0.4) * skeleton_attr.scaler;
+        next.torso.offset = Vec3::new(0.0, 0.3 + wave * -0.08, 0.4) * skeleton_attr.scaler;
         next.torso.ori =
             Quaternion::rotation_x(wave_stop * speed * -0.06 + wave_diff * speed * -0.005)
                 * Quaternion::rotation_y(tilt);
diff --git a/voxygen/src/anim/character/stand.rs b/voxygen/src/anim/character/stand.rs
index 714ff29932..9952da15b3 100644
--- a/voxygen/src/anim/character/stand.rs
+++ b/voxygen/src/anim/character/stand.rs
@@ -102,7 +102,7 @@ impl Animation for StandAnimation {
         next.draw.ori = Quaternion::rotation_y(0.0);
         next.draw.scale = Vec3::one() * 0.0;
 
-        next.torso.offset = Vec3::new(0.0, -0.2, 0.1) * skeleton_attr.scaler;
+        next.torso.offset = Vec3::new(0.0, -0.1, 0.1) * skeleton_attr.scaler;
         next.torso.ori = Quaternion::rotation_x(0.0);
         next.torso.scale = Vec3::one() / 11.0 * skeleton_attr.scaler;