From 4d904bd5ce7d7b1a805c2f8fbdda630afc27576f Mon Sep 17 00:00:00 2001
From: Cain Kilgore <cain+git@cainkilgore.com>
Date: Wed, 20 Sep 2017 18:43:16 +0100
Subject: [PATCH] Changed naming of avatarGrav

---
 libraries/physics/src/CharacterController.cpp | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/libraries/physics/src/CharacterController.cpp b/libraries/physics/src/CharacterController.cpp
index 0dcc0bcbe8..6c78b46b48 100755
--- a/libraries/physics/src/CharacterController.cpp
+++ b/libraries/physics/src/CharacterController.cpp
@@ -21,7 +21,8 @@
 const btVector3 LOCAL_UP_AXIS(0.0f, 1.0f, 0.0f);
 const float JUMP_SPEED = 3.5f;
 const float MAX_FALL_HEIGHT = 20.0f;
-float DEFAULT_CHARACTER_GRAVITY = -5.0f;
+const float DEFAULT_CHARACTER_GRAVITY = -5.0f;
+float currentAvatarGravity = DEFAULT_CHARACTER_GRAVITY;
 
 #ifdef DEBUG_STATE_CHANGE
 #define SET_STATE(desiredState, reason) setState(desiredState, reason)
@@ -359,7 +360,7 @@ void CharacterController::updateGravity() {
     if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) {
         _gravity = 0.0f;
     } else {
-        _gravity = DEFAULT_CHARACTER_GRAVITY;
+        _gravity = currentAvatarGravity;
     }
     if (_rigidBody) {
         _rigidBody->setGravity(_gravity * _currentUp);
@@ -368,11 +369,11 @@ void CharacterController::updateGravity() {
 
 
 void CharacterController::setGravity(float gravity) {
-    DEFAULT_CHARACTER_GRAVITY = gravity;
+    currentAvatarGravity = gravity;
 }
 
 float CharacterController::getGravity() {
-    return DEFAULT_CHARACTER_GRAVITY;
+    return currentAvatarGravity;
 }
 
 #ifdef DEBUG_STATE_CHANGE
@@ -393,18 +394,6 @@ void CharacterController::setState(State desiredState) {
     }
 }
 
-void CharacterController::updateGravity() {
-    int16_t collisionGroup = computeCollisionGroup();
-    if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) {
-        _gravity = 0.0f;
-    } else {
-        _gravity = DEFAULT_AVATAR_GRAVITY;
-    }
-    if (_rigidBody) {
-        _rigidBody->setGravity(_gravity * _currentUp);
-    }
-}
-
 void CharacterController::setLocalBoundingBox(const glm::vec3& minCorner, const glm::vec3& scale) {
     float x = scale.x;
     float z = scale.z;