From e44c2c8da3c11acc1b164e4bd5ebddeda650a581 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 8 May 2017 12:47:32 -0700
Subject: [PATCH] init zero gravity to agree with init hover state

---
 libraries/physics/src/CharacterController.cpp | 1 +
 libraries/physics/src/CharacterController.h   | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/physics/src/CharacterController.cpp b/libraries/physics/src/CharacterController.cpp
index fe6f882d47..e4ff1b0b44 100755
--- a/libraries/physics/src/CharacterController.cpp
+++ b/libraries/physics/src/CharacterController.cpp
@@ -361,6 +361,7 @@ void CharacterController::updateGravity() {
     if (_state == State::Hover || collisionGroup == BULLET_COLLISION_GROUP_COLLISIONLESS) {
         _gravity = 0.0f;
     } else {
+        const float DEFAULT_CHARACTER_GRAVITY = -5.0f;
         _gravity = DEFAULT_CHARACTER_GRAVITY;
     }
     if (_rigidBody) {
diff --git a/libraries/physics/src/CharacterController.h b/libraries/physics/src/CharacterController.h
index d33154ef2e..0a11fad0b7 100644
--- a/libraries/physics/src/CharacterController.h
+++ b/libraries/physics/src/CharacterController.h
@@ -32,8 +32,6 @@ const uint32_t PENDING_FLAG_JUMP = 1U << 3;
 const uint32_t PENDING_FLAG_UPDATE_COLLISION_GROUP = 1U << 4;
 const float DEFAULT_MIN_FLOOR_NORMAL_DOT_UP = cosf(PI / 3.0f);
 
-const float DEFAULT_CHARACTER_GRAVITY = -5.0f;
-
 class btRigidBody;
 class btCollisionWorld;
 class btDynamicsWorld;
@@ -183,7 +181,7 @@ protected:
     bool _stepUpEnabled { true };
     bool _hasSupport;
 
-    btScalar _gravity { DEFAULT_CHARACTER_GRAVITY };
+    btScalar _gravity { 0.0f };
 
     btScalar _jumpSpeed;
     btScalar _followTime;