Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 08:04:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

experimenting

Browse source
This commit is contained in:
Seth Alves 2016-07-11 09:52:24 -07:00
parent 1cf57b27a9
commit eac144f354
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/avatar/AvatarActionHold.cpp
View file

@ -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));
}

2
interface/src/avatar/AvatarActionHold.h
View file

@ -64,6 +64,8 @@ private:
glm::vec3 _palmOffsetFromRigidBody;
// leaving this here for future refernece.
// glm::quat _palmRotationFromRigidBody;
glm::vec3 _measuredLinearVelocity;
};
#endif // hifi_AvatarActionHold_h