From 3f2c6504a60ff304adc4c454907f450e891a1aeb Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 13 Jan 2014 12:27:47 -0800
Subject: [PATCH] fix for avatar scale bug, closes #1506

---
 interface/src/Application.cpp        | 4 ++--
 interface/src/avatar/Avatar.cpp      | 4 ++--
 libraries/avatars/src/AvatarData.cpp | 8 ++++----
 libraries/avatars/src/AvatarData.h   | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 958995daae..0830f6069f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2128,8 +2128,8 @@ void Application::updateAvatars(float deltaTime, glm::vec3 mouseRayOrigin, glm::
         Avatar* avatar = *fade;
         const float SHRINK_RATE = 0.9f;
         avatar->setNewScale(avatar->getNewScale() * SHRINK_RATE);
-        const float MINIMUM_SCALE = 0.001f;
-        if (avatar->getNewScale() < MINIMUM_SCALE) {
+
+        if (avatar->getNewScale() < MIN_AVATAR_SCALE) {
             delete avatar;
             _avatarFades.erase(fade--);
 
diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index b3b4793b39..525644b52b 100755
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -439,14 +439,14 @@ void Avatar::goHome() {
 }
 
 void Avatar::increaseSize() {
-    if ((1.f + SCALING_RATIO) * _newScale < MAX_SCALE) {
+    if ((1.f + SCALING_RATIO) * _newScale < MAX_AVATAR_SCALE) {
         _newScale *= (1.f + SCALING_RATIO);
         qDebug("Changed scale to %f\n", _newScale);
     }
 }
 
 void Avatar::decreaseSize() {
-    if (MIN_SCALE < (1.f - SCALING_RATIO) * _newScale) {
+    if (MIN_AVATAR_SCALE < (1.f - SCALING_RATIO) * _newScale) {
         _newScale *= (1.f - SCALING_RATIO);
         qDebug("Changed scale to %f\n", _newScale);
     }
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 14115ced47..b81a0601bd 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -297,10 +297,10 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
 }
 
 void AvatarData::setNewScale(float newScale) {
-    if (newScale > MAX_SCALE) {
-        newScale = MAX_SCALE;
-    } else if (newScale < MIN_SCALE) {
-        newScale = MIN_SCALE;
+    if (newScale > MAX_AVATAR_SCALE) {
+        newScale = MAX_AVATAR_SCALE;
+    } else if (newScale < MIN_AVATAR_SCALE) {
+        newScale = MIN_AVATAR_SCALE;
     }
     _newScale = newScale;
     qDebug() << "Changed scale to " << _newScale << "\n";
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index e7f359aff2..6ee320eae0 100755
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -32,8 +32,8 @@ const int HAND_STATE_START_BIT = 2; // 3rd and 4th bits
 const int IS_FACESHIFT_CONNECTED = 4; // 5th bit
 const int IS_CHAT_CIRCLING_ENABLED = 5;
 
-static const float MAX_SCALE = 1000.f;
-static const float MIN_SCALE = .005f;
+static const float MAX_AVATAR_SCALE = 1000.f;
+static const float MIN_AVATAR_SCALE = .005f;
 
 const float MAX_AUDIO_LOUDNESS = 1000.0; // close enough for mouth animation
 
@@ -83,7 +83,7 @@ public:
     
     //  Scale
     float getNewScale() const { return _newScale; }
-    void setNewScale(float);
+    void setNewScale(float newScale);
     
     //  Hand State
     void setHandState(char s) { _handState = s; }