From 69cac690675377be51e1a7e001de2be277a98e38 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 1 Aug 2013 18:56:14 -0700 Subject: [PATCH] Go ahead and show the leap hand by default, but don't include the fingers if the palms are inactive (!) --- interface/src/avatar/Hand.cpp | 2 +- libraries/avatars/src/HandData.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index 28b1af0603..f70d9aff13 100755 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -14,7 +14,7 @@ #include "Util.h" #include "renderer/ProgramObject.h" -const bool SHOW_LEAP_HAND = false; +const bool SHOW_LEAP_HAND = true; using namespace std; diff --git a/libraries/avatars/src/HandData.cpp b/libraries/avatars/src/HandData.cpp index 639b4adc0f..ebef2b1247 100755 --- a/libraries/avatars/src/HandData.cpp +++ b/libraries/avatars/src/HandData.cpp @@ -53,6 +53,9 @@ void HandData::encodeRemoteData(std::vector& fingerVectors) { fingerVectors.clear(); for (size_t i = 0; i < getNumPalms(); ++i) { PalmData& palm = getPalms()[i]; + if (!palm.isActive()) { + continue; + } fingerVectors.push_back(palm.getRawPosition()); fingerVectors.push_back(palm.getRawNormal()); for (size_t f = 0; f < palm.getNumFingers(); ++f) {