From 8fc800acffbc4689a852ff13c5326cea35216999 Mon Sep 17 00:00:00 2001
From: Jeffrey Ventrella <jeffreyventrella@gmail.com>
Date: Fri, 2 Aug 2013 10:59:04 -0700
Subject: [PATCH] some work on hands

---
 interface/src/Application.cpp        |  1 +
 interface/src/avatar/Hand.cpp        | 10 +++++-----
 libraries/avatars/src/AvatarData.cpp | 17 +++++++++++++++++
 libraries/avatars/src/HandData.cpp   |  5 ++++-
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 9b292b3d50..8048d437b7 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2024,6 +2024,7 @@ void Application::renderLookatIndicator(glm::vec3 pointOfInterest, Camera& which
 }
 
 void Application::update(float deltaTime) {
+
     //  Use Transmitter Hand to move hand if connected, else use mouse
     if (_myTransmitter.isConnected()) {
         const float HAND_FORCE_SCALING = 0.01f;
diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp
index 2e409a10bf..7e5652c5d5 100755
--- a/interface/src/avatar/Hand.cpp
+++ b/interface/src/avatar/Hand.cpp
@@ -51,6 +51,7 @@ void Hand::reset() {
 
 
 void Hand::simulate(float deltaTime, bool isMine) {
+
     if (_isRaveGloveActive) {
         updateRaveGloveParticles(deltaTime);
     }
@@ -120,9 +121,9 @@ void Hand::render(bool lookingInMirror) {
     glEnable(GL_RESCALE_NORMAL);
     
     if ( SHOW_LEAP_HAND ) {
-        renderLeapHands();
-        //renderFingerTrails();
-        //renderHandSpheres();
+        //renderLeapHands();
+        renderLeapFingerTrails();
+        renderLeapHandSpheres();
     }
 }
 
@@ -155,7 +156,6 @@ void Hand::renderRaveGloveStage() {
 }
 
 
-
 void Hand::renderLeapHands() {
     for (size_t i = 0; i < getNumPalms(); ++i) {
         PalmData& hand = getPalms()[i];
@@ -165,7 +165,6 @@ void Hand::renderLeapHands() {
     }
 }
 
-
 void Hand::renderLeapHand(PalmData& hand) {
 
     glPushMatrix();
@@ -265,6 +264,7 @@ void Hand::renderLeapFingerTrails() {
     }
 }
 
+
 void Hand::setLeapHands(const std::vector<glm::vec3>& handPositions,
                           const std::vector<glm::vec3>& handNormals) {
     for (size_t i = 0; i < getNumPalms(); ++i) {
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index 65ae0c6952..9c254453e1 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -130,6 +130,8 @@ int AvatarData::getBroadcastData(unsigned char* destinationBuffer) {
     
     // leap hand data
     std::vector<glm::vec3> fingerVectors;
+    
+//printf("about to call _handData->encodeRemoteData(fingerVectors);\n");
     _handData->encodeRemoteData(fingerVectors);
 
     if (fingerVectors.size() > 255)
@@ -244,17 +246,32 @@ int AvatarData::parseData(unsigned char* sourceBuffer, int numBytes) {
     // hand state, stored as a semi-nibble in the bitItems
     _handState = getSemiNibbleAt(bitItems,HAND_STATE_START_BIT);
 
+//printf("about to call leap hand data code in AvatarData::parseData...\n");
+
     // leap hand data
     if (sourceBuffer - startPosition < numBytes) {
+
+//printf("got inside of 'if (sourceBuffer - startPosition < numBytes)'\n");
+
+
         // check passed, bytes match
         unsigned int numFingerVectors = *sourceBuffer++;
+
+//printf("numFingerVectors = %d\n", numFingerVectors);
+
+
         if (numFingerVectors > 0) {
+        
+//printf("ok, we got fingers in AvatarData::parseData\n");
+        
             std::vector<glm::vec3> fingerVectors(numFingerVectors);
             for (size_t i = 0; i < numFingerVectors; ++i) {
                 sourceBuffer += unpackFloatScalarFromSignedTwoByteFixed((int16_t*) sourceBuffer, &(fingerVectors[i].x), fingerVectorRadix);
                 sourceBuffer += unpackFloatScalarFromSignedTwoByteFixed((int16_t*) sourceBuffer, &(fingerVectors[i].y), fingerVectorRadix);
                 sourceBuffer += unpackFloatScalarFromSignedTwoByteFixed((int16_t*) sourceBuffer, &(fingerVectors[i].z), fingerVectorRadix);
             }
+            
+//printf("about to call _handData->decodeRemoteData(fingerVectors);\n");
             _handData->decodeRemoteData(fingerVectors);
         }
     }
diff --git a/libraries/avatars/src/HandData.cpp b/libraries/avatars/src/HandData.cpp
index 7bb6eebdc0..605442c926 100755
--- a/libraries/avatars/src/HandData.cpp
+++ b/libraries/avatars/src/HandData.cpp
@@ -51,12 +51,15 @@ _owningHandData(owningHandData)
 
 void HandData::encodeRemoteData(std::vector<glm::vec3>& fingerVectors) {
     fingerVectors.clear();
+    
     for (size_t i = 0; i < getNumPalms(); ++i) {
+
         PalmData& palm = getPalms()[i];
         fingerVectors.push_back(palm.getRawPosition());
         fingerVectors.push_back(palm.getRawNormal());
         for (size_t f = 0; f < palm.getNumFingers(); ++f) {
             FingerData& finger = palm.getFingers()[f];
+            
             if (finger.isActive()) {
                 fingerVectors.push_back(finger.getTipRawPosition());
                 fingerVectors.push_back(finger.getRootRawPosition());
@@ -82,7 +85,7 @@ void HandData::decodeRemoteData(const std::vector<glm::vec3>& fingerVectors) {
         if (palmActive) {
             palm.setRawPosition(fingerVectors[vectorIndex++]);
             palm.setRawNormal(fingerVectors[vectorIndex++]);
-            for (size_t f = 0; f < NUM_FINGERS_PER_HAND; ++f) {
+            for (size_t f = 0; f < NUM_FINGERS_PER_HAND; ++f) {            
                 FingerData& finger = palm.getFingers()[i];
                 finger.setRawTipPosition(fingerVectors[vectorIndex++]);
                 finger.setRawRootPosition(fingerVectors[vectorIndex++]);