From 8f304d95b39aeda6e2e20d6a5b1dfc0eea7caba9 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 25 Feb 2016 15:26:42 -0800
Subject: [PATCH 1/2] rather than computing a velocity for entities held by
 others as a way to keep it active in local bullet, just call activateBody
 over and over

---
 interface/src/avatar/AvatarActionHold.cpp | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp
index 5b493c4215..03842ca5f9 100644
--- a/interface/src/avatar/AvatarActionHold.cpp
+++ b/interface/src/avatar/AvatarActionHold.cpp
@@ -153,32 +153,10 @@ std::shared_ptr<Avatar> AvatarActionHold::getTarget(float deltaTimeStep, glm::qu
                 palmPosition = holdingAvatar->getLeftPalmPosition();
                 palmRotation = holdingAvatar->getLeftPalmRotation();
             }
-
-            // In this case we are simulating the grab of another avatar.
-            // Because the hand controller velocity for their palms is not transmitted over the
-            // network, we have to synthesize our own.
-
-            if (_previousSet) {
-                // smooth linear velocity over two frames
-                glm::vec3 positionalDelta = palmPosition - _previousPositionalTarget;
-                linearVelocity = (positionalDelta + _previousPositionalDelta) / (deltaTimeStep + _previousDeltaTimeStep);
-                glm::quat deltaRotation = palmRotation * glm::inverse(_previousRotationalTarget);
-                float rotationAngle = glm::angle(deltaRotation);
-                if (rotationAngle > EPSILON) {
-                    angularVelocity = glm::normalize(glm::axis(deltaRotation));
-                    angularVelocity *= (rotationAngle / deltaTimeStep);
-                }
-
-                _previousPositionalDelta = positionalDelta;
-                _previousDeltaTimeStep = deltaTimeStep;
-            }
         }
 
         rotation = palmRotation * _relativeRotation;
         position = palmPosition + rotation * _relativePosition;
-
-        // update linearVelocity based on offset via _relativePosition;
-        linearVelocity = linearVelocity + glm::cross(angularVelocity, position - palmPosition);
     });
 
     return holdingAvatar;
@@ -278,6 +256,7 @@ void AvatarActionHold::doKinematicUpdate(float deltaTimeStep) {
     });
 
     forceBodyNonStatic();
+    activateBody(true);
 }
 
 bool AvatarActionHold::updateArguments(QVariantMap arguments) {

From 74452bc89009753af163f6fefb2322cdb6baf45f Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 25 Feb 2016 15:34:50 -0800
Subject: [PATCH 2/2] put back some code that shouldn't have been removed

---
 interface/src/avatar/AvatarActionHold.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp
index 03842ca5f9..b62cae1d58 100644
--- a/interface/src/avatar/AvatarActionHold.cpp
+++ b/interface/src/avatar/AvatarActionHold.cpp
@@ -157,6 +157,9 @@ std::shared_ptr<Avatar> AvatarActionHold::getTarget(float deltaTimeStep, glm::qu
 
         rotation = palmRotation * _relativeRotation;
         position = palmPosition + rotation * _relativePosition;
+
+        // update linearVelocity based on offset via _relativePosition;
+        linearVelocity = linearVelocity + glm::cross(angularVelocity, position - palmPosition);
     });
 
     return holdingAvatar;