From b6ac73bb57dc7ec2c6131a0681d88078499a6a60 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Thu, 19 Dec 2013 23:12:11 -0800 Subject: [PATCH] merge --- interface/src/avatar/Hand.cpp | 4 ++++ 1 file changed, 4 insertions(+) mode change 100755 => 100644 interface/src/avatar/Hand.cpp diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp old mode 100755 new mode 100644 index a6cca4c6e5..af86c29345 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -131,6 +131,10 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f _ballParticleEditHandles[handID] = caughtParticle; caughtParticle = NULL; // Play a catch sound! + _catchInjector.setPosition(targetPosition); + + // inject the catch sound to the mixer and play it locally + _catchInjector.injectViaThread(app->getAudio()); app->getAudio()->startDrumSound(1.0, 300, 0.75, 0.015); } }