History

Merge branch 'master' into ajt/new-anim-system

Anthony J. Thibault committed 11 years ago

Commit de31b922 parents 46b3a7f d55c92711 files · +177 −77Browse files

Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all

Unified · Split

interface/src/Application.cpp+1−1
@@ -4924,7 +4924,7 @@ void Application::setPalmData(Hand* hand, UserInputMapper::PoseValue pose, float · 4923 unmodified lines
4924 4924
4925 // Store the one fingertip in the palm structure so we can track velocity4925 // Store the one fingertip in the palm structure so we can track velocity
4926 const float FINGER_LENGTH = 0.3f; // meters4926 const float FINGER_LENGTH = 0.3f; // meters
4927 const glm::vec3 FINGER_VECTOR(0.0f, 0.0f, FINGER_LENGTH);4927 const glm::vec3 FINGER_VECTOR(0.0f, FINGER_LENGTH, 0.0f);
4928 const glm::vec3 newTipPosition = position + rotation * FINGER_VECTOR;4928 const glm::vec3 newTipPosition = position + rotation * FINGER_VECTOR;
4929 glm::vec3 oldTipPosition = palm->getTipRawPosition();4929 glm::vec3 oldTipPosition = palm->getTipRawPosition();
4930 if (deltaTime > 0.0f) {4930 if (deltaTime > 0.0f) {