From 305a75c2b74a4b43831164e87272699d8f531af8 Mon Sep 17 00:00:00 2001
From: Philip Rosedale <philip@highfidelity.io>
Date: Thu, 12 Dec 2013 12:33:04 -0800
Subject: [PATCH] =?UTF-8?q?don=E2=80=99t=20render=20toy=20ball=20if=20hand?=
 =?UTF-8?q?=20controller=20trigger=20not=20pressed=20at=20all?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 interface/src/avatar/Hand.cpp | 6 +++++-
 interface/src/avatar/Hand.h   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp
index a085a42953..cc4c64d1e5 100755
--- a/interface/src/avatar/Hand.cpp
+++ b/interface/src/avatar/Hand.cpp
@@ -42,6 +42,7 @@ Hand::Hand(Avatar* owningAvatar) :
     _toyBallVelocity(0),
     _toyBallInHand(false),
     _hasToyBall(false),
+    _toyBallShouldRender(false),
     _ballParticleEditHandle(NULL),
     _pitchUpdate(0)
 {
@@ -61,9 +62,11 @@ void Hand::reset() {
 }
 
 void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, float deltaTime) {
+    
     // Is the controller button being held down....
     if (palm.getControllerButtons() & BUTTON_FWD) {
         //  If grabbing toy ball, add forces to it.
+        _toyBallShouldRender = true;
 
         // If we don't currently have a ball in hand, then create it...
         if (!_toyBallInHand) {
@@ -357,7 +360,8 @@ void Hand::render( bool isMine) {
     }
 
     //  Render toy ball
-    if (isMine) {
+    
+    if (isMine && _toyBallShouldRender) {
         glPushMatrix();
         glColor3f(1, 0, 0);
         glTranslatef(_toyBallPosition.x, _toyBallPosition.y, _toyBallPosition.z);
diff --git a/interface/src/avatar/Hand.h b/interface/src/avatar/Hand.h
index 1d3dc7b724..771b0d5e26 100755
--- a/interface/src/avatar/Hand.h
+++ b/interface/src/avatar/Hand.h
@@ -100,6 +100,8 @@ private:
     glm::vec3 _toyBallVelocity;
     bool _toyBallInHand;
     bool _hasToyBall;
+    bool _toyBallShouldRender;
+    
     ParticleEditHandle* _ballParticleEditHandle;
     
     float _pitchUpdate;