From 8114fdd1e2e9ef7732149f940b7a6ea179d8a200 Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@highfidelity.io>
Date: Tue, 31 Mar 2015 21:51:50 -0700
Subject: [PATCH] move button locations, names some constants in avatar
 controller

---
 examples/dice.js                              | 21 ++++++++++++-------
 libraries/physics/src/CharacterController.cpp |  4 ++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/examples/dice.js b/examples/dice.js
index 823ad1cb9b..d27de904d7 100644
--- a/examples/dice.js
+++ b/examples/dice.js
@@ -24,20 +24,24 @@ HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
 var rollSound = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/dice/diceRoll.wav");
 
 var screenSize = Controller.getViewportDimensions();
+
+var BUTTON_SIZE = 32;
+var PADDING = 3;
+
 var offButton = Overlays.addOverlay("image", {
-                    x: screenSize.x - 48,
-                    y: 96,
-                    width: 32,
-                    height: 32,
+                    x: screenSize.x / 2 - BUTTON_SIZE,
+                    y: screenSize.y- (BUTTON_SIZE + PADDING),
+                    width: BUTTON_SIZE,
+                    height: BUTTON_SIZE,
                     imageURL: HIFI_PUBLIC_BUCKET + "images/close.png",
                     color: { red: 255, green: 255, blue: 255},
                     alpha: 1
                 });
 var diceButton = Overlays.addOverlay("image", {
-                    x: screenSize.x - 48,
-                    y: 130,
-                    width: 32,
-                    height: 32,
+                    x: screenSize.x / 2 + PADDING,
+                    y: screenSize.y - (BUTTON_SIZE + PADDING),
+                    width: BUTTON_SIZE,
+                    height: BUTTON_SIZE,
                     imageURL: HIFI_PUBLIC_BUCKET + "images/die.png",
                     color: { red: 255, green: 255, blue: 255},
                     alpha: 1
@@ -48,6 +52,7 @@ var LIFETIME = 300;
 // NOTE: angularVelocity is in radians/sec
 var MAX_ANGULAR_SPEED = Math.PI;
 
+
 function shootDice(position, velocity) {
     for (var i = 0; i < NUMBER_OF_DICE; i++) {
         dice.push(Entities.addEntity(
diff --git a/libraries/physics/src/CharacterController.cpp b/libraries/physics/src/CharacterController.cpp
index 2657e28bd3..f8c8e31ece 100755
--- a/libraries/physics/src/CharacterController.cpp
+++ b/libraries/physics/src/CharacterController.cpp
@@ -212,9 +212,9 @@ btVector3 CharacterController::perpindicularComponent(const btVector3& direction
 }
 
 const btVector3 LOCAL_UP_AXIS(0.0f, 1.0f, 0.0f);
-const float DEFAULT_GRAVITY = 3.5f;
+const float DEFAULT_GRAVITY = 5.0f;
 const float TERMINAL_VELOCITY = 55.0f;
-const float JUMP_SPEED = 2.5f;
+const float JUMP_SPEED = 5.0f;
 
 CharacterController::CharacterController(AvatarData* avatarData) {
     assert(avatarData);