From c0f319f077f4bec5a40a3780521f57a2cc23fd52 Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Mon, 15 Jul 2013 14:36:11 -0700 Subject: [PATCH] merge --- interface/src/Application.cpp | 8 +++++++- libraries/avatars/src/HandData.h | 0 2 files changed, 7 insertions(+), 1 deletion(-) mode change 100755 => 100644 libraries/avatars/src/HandData.h diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 44c2bc5200..d7ff6fe959 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2037,7 +2037,6 @@ void Application::update(float deltaTime) { _audio.eventuallyAnalyzePing(); #endif - if (TESTING_PARTICLE_SYSTEM) { if (!_particleSystemInitialized) { @@ -2100,6 +2099,13 @@ void Application::update(float deltaTime) { 1.0f + cosf(t * 9.0f) * 0.02f, 3.0f + sinf(t * 7.0f) * 0.02f ); + + +//_myAvatar.getHand().setLeapFingers(LeapManager::getFingerTips(), LeapManager::getFingerRoots()); +//_myAvatar.getHand().setLeapHands(LeapManager::getHandPositions(), LeapManager::getHandNormals()); + + + glm::vec3 tilt = glm::vec3 ( diff --git a/libraries/avatars/src/HandData.h b/libraries/avatars/src/HandData.h old mode 100755 new mode 100644