Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-30 09:19:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

treat children of avatars and children of entities differently until this is fixed

Browse source
This commit is contained in:
Seth Alves 2016-04-09 08:37:41 -07:00
parent b87e8220c4
commit 3890a71433
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/shared/src/SpatiallyNestable.cpp
View file

@ -422,8 +422,18 @@ void SpatiallyNestable::setVelocity(const glm::vec3& velocity, bool& success) {
glm::vec3 parentVelocity = getParentVelocity(success); glm::vec3 parentVelocity = getParentVelocity(success);
Transform parentTransform = getParentTransform(success); Transform parentTransform = getParentTransform(success);
_velocityLock.withWriteLock([&] { _velocityLock.withWriteLock([&] {
// TODO: take parent angularVelocity into account. // HACK: until we are treating _velocity the same way we treat _position (meaning,
_velocity = glm::inverse(parentTransform.getRotation()) * (velocity - parentVelocity); // _velocity is a vs parent value and any request for a world-frame velocity must
// be computed), do this to avoid equipped (parenting-grabbed) things from drifting.
// turning a zero velocity into a non-zero _velocity (because the avatar is moving)
// causes EntityItem::simulateKinematicMotion to have an effect on the equipped entity,
// which causes it to drift from the hand.
if (hasAncestorOfType(NestableType::Avatar)) {
_velocity = velocity;
} else {
// TODO: take parent angularVelocity into account.
_velocity = glm::inverse(parentTransform.getRotation()) * (velocity - parentVelocity);
}
}); });
} }