From eac144f35476762dfb6d99155320d22a00445b69 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 11 Jul 2016 09:52:24 -0700 Subject: [PATCH] experimenting --- interface/src/avatar/AvatarActionHold.cpp | 9 ++++++++- interface/src/avatar/AvatarActionHold.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp index 1babb478b8..2baaae6ee4 100644 --- a/interface/src/avatar/AvatarActionHold.cpp +++ b/interface/src/avatar/AvatarActionHold.cpp @@ -204,8 +204,15 @@ void AvatarActionHold::doKinematicUpdate(float deltaTimeStep) { } withWriteLock([&]{ + if (_previousSet) { + _measuredLinearVelocity = (_positionalTarget - _previousPositionalTarget) / deltaTimeStep; + } else { + _measuredLinearVelocity = glm::vec3(); + } + if (_kinematicSetVelocity) { - rigidBody->setLinearVelocity(glmToBullet(_linearVelocityTarget)); + // rigidBody->setLinearVelocity(glmToBullet(_linearVelocityTarget)); + rigidBody->setLinearVelocity(glmToBullet(_measuredLinearVelocity)); rigidBody->setAngularVelocity(glmToBullet(_angularVelocityTarget)); } diff --git a/interface/src/avatar/AvatarActionHold.h b/interface/src/avatar/AvatarActionHold.h index 609fd57ff3..e246ac5f36 100644 --- a/interface/src/avatar/AvatarActionHold.h +++ b/interface/src/avatar/AvatarActionHold.h @@ -64,6 +64,8 @@ private: glm::vec3 _palmOffsetFromRigidBody; // leaving this here for future refernece. // glm::quat _palmRotationFromRigidBody; + + glm::vec3 _measuredLinearVelocity; }; #endif // hifi_AvatarActionHold_h