Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 19:50:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into controllers

Browse source
This commit is contained in:
samcake 2015-11-06 12:38:07 -08:00
commit 703a6bdb95
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -107,8 +107,12 @@ void AvatarActionHold::doKinematicUpdate(float deltaTimeStep) {
withWriteLock([&]{ withWriteLock([&]{
if (_kinematicSetVelocity) { if (_kinematicSetVelocity) {
if (_previousSet) { if (_previousSet) {
glm::vec3 positionalVelocity = (_positionalTarget - _previousPositionalTarget) / deltaTimeStep; // smooth velocity over 2 frames
glm::vec3 positionalDelta = _positionalTarget - _previousPositionalTarget;
glm::vec3 positionalVelocity = (positionalDelta + _previousPositionalDelta) / (deltaTimeStep + _previousDeltaTimeStep);
rigidBody->setLinearVelocity(glmToBullet(positionalVelocity)); rigidBody->setLinearVelocity(glmToBullet(positionalVelocity));
_previousPositionalDelta = positionalDelta;
_previousDeltaTimeStep = deltaTimeStep;
} }
} }

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

@ -46,6 +46,9 @@ private:
bool _previousSet { false }; bool _previousSet { false };
glm::vec3 _previousPositionalTarget; glm::vec3 _previousPositionalTarget;
glm::quat _previousRotationalTarget; glm::quat _previousRotationalTarget;
float _previousDeltaTimeStep = 0.0f;
glm::vec3 _previousPositionalDelta;
}; };
#endif // hifi_AvatarActionHold_h #endif // hifi_AvatarActionHold_h