From eeb9e76902a63e351f548aeb144ce73bc77d3c35 Mon Sep 17 00:00:00 2001
From: Marcel <marcel.cochem@googlemail.com>
Date: Thu, 1 Apr 2021 18:45:03 +0000
Subject: [PATCH] Revert "Merge branch 'animtweaks' into 'master'"

This reverts merge request !2039
---
 voxygen/anim/src/character/mod.rs | 24 ++++++++++++------------
 voxygen/src/scene/camera.rs       |  2 +-
 voxygen/src/scene/mod.rs          | 11 +++++------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/voxygen/anim/src/character/mod.rs b/voxygen/anim/src/character/mod.rs
index 265271c68b..96fb1b01dc 100644
--- a/voxygen/anim/src/character/mod.rs
+++ b/voxygen/anim/src/character/mod.rs
@@ -201,18 +201,18 @@ impl<'a> From<&'a Body> for SkeletonAttr {
         Self {
             scaler: match (body.species, body.body_type) {
                 // TODO : Derive scale from body proportions
-                (Orc, Male) => 0.114,
-                (Orc, Female) => 0.102,
-                (Human, Male) => 0.102,
-                (Human, Female) => 0.096,
-                (Elf, Male) => 0.102,
-                (Elf, Female) => 0.096,
-                (Dwarf, Male) => 0.084,
-                (Dwarf, Female) => 0.078,
-                (Undead, Male) => 0.096,
-                (Undead, Female) => 0.09,
-                (Danari, Male) => 0.070,
-                (Danari, Female) => 0.070,
+                (Orc, Male) => 1.14,
+                (Orc, Female) => 1.02,
+                (Human, Male) => 1.02,
+                (Human, Female) => 0.96,
+                (Elf, Male) => 1.02,
+                (Elf, Female) => 0.96,
+                (Dwarf, Male) => 0.84,
+                (Dwarf, Female) => 0.78,
+                (Undead, Male) => 0.96,
+                (Undead, Female) => 0.9,
+                (Danari, Male) => 0.70,
+                (Danari, Female) => 0.70,
             },
             head_scale: match (body.species, body.body_type) {
                 (Orc, Male) => 0.9,
diff --git a/voxygen/src/scene/camera.rs b/voxygen/src/scene/camera.rs
index b3bb418b15..ebd005a004 100644
--- a/voxygen/src/scene/camera.rs
+++ b/voxygen/src/scene/camera.rs
@@ -187,7 +187,7 @@ impl Camera {
     pub fn zoom_switch(&mut self, delta: f32) {
         if delta > 0_f32 || self.mode != CameraMode::FirstPerson {
             let t = self.tgt_dist + delta;
-            const MIN_THIRD_PERSON: f32 = 0.35;
+            const MIN_THIRD_PERSON: f32 = 2.35;
             match self.mode {
                 CameraMode::ThirdPerson => {
                     if t < MIN_THIRD_PERSON {
diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index b5f4fe7437..5da05fdfa0 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -499,16 +499,15 @@ impl Scene {
         let up = match self.camera.get_mode() {
             CameraMode::FirstPerson => {
                 if player_rolling {
-                    player_height * 0.42 * 0.1
+                    player_height * 0.42
                 } else if is_running && on_ground.unwrap_or(false) {
-                    player_eye_height * 0.1
-                        + (scene_data.state.get_time() as f32 * 17.0).sin() * 0.05
+                    player_eye_height + (scene_data.state.get_time() as f32 * 17.0).sin() * 0.05
                 } else {
-                    player_eye_height * 0.1
+                    player_eye_height
                 }
             },
-            CameraMode::ThirdPerson if scene_data.is_aiming => player_height * 1.16 * 0.1,
-            CameraMode::ThirdPerson => player_eye_height * 0.1,
+            CameraMode::ThirdPerson if scene_data.is_aiming => player_height * 1.16,
+            CameraMode::ThirdPerson => player_eye_height,
             CameraMode::Freefly => 0.0,
         };