From fc21f7bbacbcce8009df663aaed2a48287f72c8b Mon Sep 17 00:00:00 2001
From: barnold1953 <brb555@utk.edu>
Date: Thu, 10 Jul 2014 14:21:17 -0700
Subject: [PATCH] Removed outdated and incorrect getFingerTipPosition()

---
 interface/src/BuckyBalls.cpp       | 2 +-
 interface/src/avatar/Hand.cpp      | 4 ++--
 libraries/avatars/src/HandData.cpp | 6 ------
 libraries/avatars/src/HandData.h   | 1 -
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/interface/src/BuckyBalls.cpp b/interface/src/BuckyBalls.cpp
index 68d1167071..1bc093283a 100644
--- a/interface/src/BuckyBalls.cpp
+++ b/interface/src/BuckyBalls.cpp
@@ -60,7 +60,7 @@ BuckyBalls::BuckyBalls() {
 
 void BuckyBalls::grab(PalmData& palm, float deltaTime) {
     float penetration;
-    glm::vec3 fingerTipPosition = palm.getFingerTipPosition();
+    glm::vec3 fingerTipPosition = palm.getTipPosition();
 
     if (palm.getControllerButtons() & BUTTON_FWD) {
         if (!_bballIsGrabbed[palm.getSixenseID()]) {
diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp
index 7faf1aaadc..aae9cb0a29 100644
--- a/interface/src/avatar/Hand.cpp
+++ b/interface/src/avatar/Hand.cpp
@@ -145,7 +145,7 @@ void Hand::renderHandTargets(bool isMine) {
             if (!palm.isActive()) {
                 continue;
             }
-            glm::vec3 targetPosition = palm.getFingerTipPosition();
+            glm::vec3 targetPosition = palm.getTipPosition();
             glPushMatrix();
             glTranslatef(targetPosition.x, targetPosition.y, targetPosition.z);
         
@@ -166,7 +166,7 @@ void Hand::renderHandTargets(bool isMine) {
         PalmData& palm = getPalms()[i];
         if (palm.isActive()) {
             glColor4f(handColor.r, handColor.g, handColor.b, alpha);
-            glm::vec3 tip = palm.getFingerTipPosition();
+            glm::vec3 tip = palm.getTipPosition();
             glm::vec3 root = palm.getPosition();
 
             //Scale the positions based on avatar scale
diff --git a/libraries/avatars/src/HandData.cpp b/libraries/avatars/src/HandData.cpp
index e6ef10ed3e..69f9669973 100644
--- a/libraries/avatars/src/HandData.cpp
+++ b/libraries/avatars/src/HandData.cpp
@@ -108,12 +108,6 @@ glm::quat HandData::getBaseOrientation() const {
 glm::vec3 HandData::getBasePosition() const {
     return _owningAvatarData->getPosition();
 }
-
-glm::vec3 PalmData::getFingerTipPosition() const {
-    glm::vec3 fingerOffset(0.0f, 0.0f, 0.3f);
-    glm::vec3 palmOffset(0.0f, -0.08f, 0.0f);
-    return getPosition() + _owningHandData->localToWorldDirection(_rawRotation * (fingerOffset + palmOffset));
-}
         
 glm::vec3 PalmData::getFingerDirection() const {
     const glm::vec3 LOCAL_FINGER_DIRECTION(0.0f, 0.0f, 1.0f);
diff --git a/libraries/avatars/src/HandData.h b/libraries/avatars/src/HandData.h
index 404d00b0f3..770a44197d 100755
--- a/libraries/avatars/src/HandData.h
+++ b/libraries/avatars/src/HandData.h
@@ -140,7 +140,6 @@ public:
     void getBallHoldPosition(glm::vec3& position) const;
 
     // return world-frame:
-    glm::vec3 getFingerTipPosition() const;
     glm::vec3 getFingerDirection() const;
     glm::vec3 getNormal() const;