From d1a8c18d10621dd29df8f21cb7bf9bb9e860d776 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Tue, 27 May 2014 16:32:29 -0700
Subject: [PATCH] simplified hand index constants

---
 interface/src/devices/PrioVR.cpp   | 8 ++++----
 libraries/avatars/src/HandData.cpp | 4 ++--
 libraries/avatars/src/HandData.h   | 8 ++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/interface/src/devices/PrioVR.cpp b/interface/src/devices/PrioVR.cpp
index deba4f82a5..3e19f1800e 100644
--- a/interface/src/devices/PrioVR.cpp
+++ b/interface/src/devices/PrioVR.cpp
@@ -63,7 +63,7 @@ static void setPalm(float deltaTime, int index) {
     if (!Application::getInstance()->getJoystickManager()->getJoystickStates().isEmpty()) {
         const JoystickState& state = Application::getInstance()->getJoystickManager()->getJoystickStates().at(0);
         if (state.axes.size() >= 4 && state.buttons.size() >= 4) {
-            if (index == SIXENSE_CONTROLLER_ID_LEFT_HAND) {
+            if (index == LEFT_HAND_INDEX) {
                 palm->setControllerButtons(state.buttons.at(1) ? BUTTON_FWD : 0);
                 palm->setTrigger(state.buttons.at(0) ? 1.0f : 0.0f);
                 palm->setJoystick(state.axes.at(0), -state.axes.at(1));
@@ -82,7 +82,7 @@ static void setPalm(float deltaTime, int index) {
     Model* skeletonModel = &Application::getInstance()->getAvatar()->getSkeletonModel();
     int jointIndex;
     glm::quat inverseRotation = glm::inverse(Application::getInstance()->getAvatar()->getOrientation());
-    if (index == SIXENSE_CONTROLLER_ID_LEFT_HAND) {
+    if (index == LEFT_HAND_INDEX) {
         jointIndex = skeletonModel->getLeftHandJointIndex();
         skeletonModel->getJointRotation(jointIndex, rotation, true);      
         rotation = inverseRotation * rotation * glm::quat(glm::vec3(0.0f, PI_OVER_TWO, 0.0f));
@@ -180,8 +180,8 @@ void PrioVR::update(float deltaTime) {
     }
     
     // convert the joysticks into palm data
-    setPalm(deltaTime, SIXENSE_CONTROLLER_ID_LEFT_HAND);
-    setPalm(deltaTime, SIXENSE_CONTROLLER_ID_RIGHT_HAND);
+    setPalm(deltaTime, LEFT_HAND_INDEX);
+    setPalm(deltaTime, RIGHT_HAND_INDEX);
 #endif
 }
 
diff --git a/libraries/avatars/src/HandData.cpp b/libraries/avatars/src/HandData.cpp
index c0553a2b57..e6ef10ed3e 100644
--- a/libraries/avatars/src/HandData.cpp
+++ b/libraries/avatars/src/HandData.cpp
@@ -53,10 +53,10 @@ void HandData::getLeftRightPalmIndices(int& leftPalmIndex, int& rightPalmIndex)
     for (size_t i = 0; i < _palms.size(); i++) {
         const PalmData& palm = _palms[i];
         if (palm.isActive()) {
-            if (palm.getSixenseID() == SIXENSE_CONTROLLER_ID_LEFT_HAND) {
+            if (palm.getSixenseID() == LEFT_HAND_INDEX) {
                 leftPalmIndex = i;
             }
-            if (palm.getSixenseID() == SIXENSE_CONTROLLER_ID_RIGHT_HAND) {
+            if (palm.getSixenseID() == RIGHT_HAND_INDEX) {
                 rightPalmIndex = i;
             }
         }
diff --git a/libraries/avatars/src/HandData.h b/libraries/avatars/src/HandData.h
index 7e8622f518..404d00b0f3 100755
--- a/libraries/avatars/src/HandData.h
+++ b/libraries/avatars/src/HandData.h
@@ -23,16 +23,12 @@
 class AvatarData;
 class PalmData;
 
+const int LEFT_HAND_INDEX = 0;
+const int RIGHT_HAND_INDEX = 1;
 const int NUM_HANDS = 2;
-const int NUM_FINGERS_PER_HAND = 5;
-const int NUM_FINGERS = NUM_HANDS * NUM_FINGERS_PER_HAND;
 
-const int LEAPID_INVALID = -1;
 const int SIXENSEID_INVALID = -1;
 
-const int SIXENSE_CONTROLLER_ID_LEFT_HAND = 0;
-const int SIXENSE_CONTROLLER_ID_RIGHT_HAND = 1;
-
 class HandData {
 public:
     HandData(AvatarData* owningAvatar);