Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-10 04:59:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

back out some changes

Browse source
This commit is contained in:
Seth Alves 2016-06-08 14:07:16 -07:00
parent d7fc789ea7
commit a312218722
1 changed files with 16 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -415,10 +415,14 @@ void SpatiallyNestable::setVelocity(const glm::vec3& velocity, bool& success) {
glm::vec3 parentVelocity = getParentVelocity(success);
Transform parentTransform = getParentTransform(success);
_velocityLock.withWriteLock([&] {
// HACK: The entity-server doesn't know where avatars are. In order to avoid having the server
// try to do simple extrapolation, set relative velocities to zero if this is a child of an avatar.
// HACK: until we are treating _velocity the same way we treat _position (meaning,
// _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::stepKinematicMotion to have an effect on the equipped entity,
// which causes it to drift from the hand.
if (hasAncestorOfType(NestableType::Avatar)) {
_velocity = glm::vec3(0.0f);
_velocity = velocity;
} else {
// TODO: take parent angularVelocity into account.
_velocity = glm::inverse(parentTransform.getRotation()) * (velocity - parentVelocity);
@ -475,12 +479,7 @@ void SpatiallyNestable::setAngularVelocity(const glm::vec3& angularVelocity, boo
glm::vec3 parentAngularVelocity = getParentAngularVelocity(success);
Transform parentTransform = getParentTransform(success);
_angularVelocityLock.withWriteLock([&] {
if (hasAncestorOfType(NestableType::Avatar)) {
// TODO: this is done to keep entity-server from doing extrapolation, and isn't right.
_angularVelocity = glm::vec3(0.0f);
} else {
_angularVelocity = glm::inverse(parentTransform.getRotation()) * (angularVelocity - parentAngularVelocity);
}
_angularVelocity = glm::inverse(parentTransform.getRotation()) * (angularVelocity - parentAngularVelocity);
});
}
@ -894,21 +893,13 @@ void SpatiallyNestable::setLocalTransformAndVelocities(
_transformLock.withWriteLock([&] {
_transform = localTransform;
});
// linear and angular velocity
if (hasAncestorOfType(NestableType::Avatar)) {
_velocityLock.withWriteLock([&] {
_velocity = glm::vec3(0.0f);
});
_angularVelocityLock.withWriteLock([&] {
_angularVelocity = glm::vec3(0.0f);
});
} else {
_velocityLock.withWriteLock([&] {
_velocity = localVelocity;
});
_angularVelocityLock.withWriteLock([&] {
_angularVelocity = localAngularVelocity;
});
}
// linear velocity
_velocityLock.withWriteLock([&] {
_velocity = localVelocity;
});
// angular velocity
_angularVelocityLock.withWriteLock([&] {
_angularVelocity = localAngularVelocity;
});
locationChanged(false);
}