From 80b970f2d985da7c872640f284ace633ef6737c0 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 19 Sep 2016 08:58:19 -0700
Subject: [PATCH] adding MyAvatar::_canonicalScale, but not used yet

---
 interface/src/avatar/MyAvatar.cpp | 2 ++
 interface/src/avatar/MyAvatar.h   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index e5ea9fe1af..245eba0098 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1229,6 +1229,8 @@ void MyAvatar::rebuildCollisionShape() {
     float scale = getUniformScale();
     float radius = scale * _skeletonModel->getBoundingCapsuleRadius();
     float height = scale * _skeletonModel->getBoundingCapsuleHeight() + 2.0f * radius;
+    const float CANONICAL_AVATAR_HEIGHT = 2.0f;
+    _canonicalScale = height / CANONICAL_AVATAR_HEIGHT;
     glm::vec3 corner(-radius, -0.5f * height, -radius);
     corner += scale * _skeletonModel->getBoundingCapsuleOffset();
     glm::vec3 diagonal(2.0f * radius, height, 2.0f * radius);
diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 87daba0267..6e00894cb3 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -500,6 +500,7 @@ private:
 
     bool _hmdLeanRecenterEnabled = true;
     bool _moveKinematically { false }; // KINEMATIC_CONTROLLER_HACK
+    float _canonicalScale { 1.0f };
 
     float AVATAR_MOVEMENT_ENERGY_CONSTANT { 0.001f };
     float AUDIO_ENERGY_CONSTANT { 0.000001f };