From 366e9c7d3452cbed0cc78edbd59463c8a615b64f Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 14 May 2014 09:05:54 -0700
Subject: [PATCH] PalmDataA::getPalmDirection --> getNormal()

---
 interface/src/avatar/Avatar.cpp                          | 2 +-
 interface/src/avatar/Hand.cpp                            | 3 +--
 interface/src/scripting/ControllerScriptingInterface.cpp | 2 +-
 libraries/avatars/src/HandData.cpp                       | 2 +-
 libraries/avatars/src/HandData.h                         | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 2bd0bbbc6d..20f6275441 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -622,7 +622,7 @@ bool Avatar::findParticleCollisions(const glm::vec3& particleCenter, float parti
 
                 glm::vec3 fingerAxis = palm->getFingerDirection();
                 glm::vec3 diskCenter = handPosition + HAND_PADDLE_OFFSET * fingerAxis;
-                glm::vec3 diskNormal = palm->getPalmDirection();
+                glm::vec3 diskNormal = palm->getNormal();
                 const float DISK_THICKNESS = 0.08f;
 
                 // collide against the disk
diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp
index 78eab424ab..ee7a633a54 100644
--- a/interface/src/avatar/Hand.cpp
+++ b/interface/src/avatar/Hand.cpp
@@ -23,7 +23,6 @@
 
 using namespace std;
 
-const float FINGERTIP_COLLISION_RADIUS = 0.01f;
 const float PALM_COLLISION_RADIUS = 0.03f;
 
 
@@ -201,7 +200,7 @@ void Hand::renderHandTargets(bool isMine) {
             glm::vec3 root = palm.getPosition();
             Avatar::renderJointConnectingCone(root, tip, PALM_FINGER_ROD_RADIUS, PALM_FINGER_ROD_RADIUS);
             //  Render sphere at palm/finger root
-            glm::vec3 offsetFromPalm = root + palm.getPalmDirection() * PALM_DISK_THICKNESS;
+            glm::vec3 offsetFromPalm = root + palm.getNormal() * PALM_DISK_THICKNESS;
             Avatar::renderJointConnectingCone(root, offsetFromPalm, PALM_DISK_RADIUS, 0.0f);
             glPushMatrix();
             glTranslatef(root.x, root.y, root.z);
diff --git a/interface/src/scripting/ControllerScriptingInterface.cpp b/interface/src/scripting/ControllerScriptingInterface.cpp
index 5e58ac66ea..58a08066d6 100644
--- a/interface/src/scripting/ControllerScriptingInterface.cpp
+++ b/interface/src/scripting/ControllerScriptingInterface.cpp
@@ -198,7 +198,7 @@ glm::vec3 ControllerScriptingInterface::getSpatialControlNormal(int controlIndex
     if (palmData) {
         switch (controlOfPalm) {
             case PALM_SPATIALCONTROL:
-                return palmData->getPalmDirection();
+                return palmData->getNormal();
             case TIP_SPATIALCONTROL:
                 return palmData->getFingerDirection();
         }
diff --git a/libraries/avatars/src/HandData.cpp b/libraries/avatars/src/HandData.cpp
index bd366f020a..0105145466 100644
--- a/libraries/avatars/src/HandData.cpp
+++ b/libraries/avatars/src/HandData.cpp
@@ -120,7 +120,7 @@ glm::vec3 PalmData::getFingerDirection() const {
     return _owningHandData->localToWorldDirection(_rawRotation * LOCAL_FINGER_DIRECTION);
 }
 
-glm::vec3 PalmData::getPalmDirection() const {
+glm::vec3 PalmData::getNormal() const {
     const glm::vec3 LOCAL_PALM_DIRECTION(0.0f, -1.0f, 0.0f);
     return _owningHandData->localToWorldDirection(_rawRotation * LOCAL_PALM_DIRECTION);
 }
diff --git a/libraries/avatars/src/HandData.h b/libraries/avatars/src/HandData.h
index 1f2d134c43..505b1b600a 100755
--- a/libraries/avatars/src/HandData.h
+++ b/libraries/avatars/src/HandData.h
@@ -146,7 +146,7 @@ public:
     // return world-frame:
     glm::vec3 getFingerTipPosition() const;
     glm::vec3 getFingerDirection() const;
-    glm::vec3 getPalmDirection() const;
+    glm::vec3 getNormal() const;
 
 private:
     glm::quat _rawRotation;