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

fix offset math in hold action

Browse source
This commit is contained in:
Seth Alves 2015-12-17 11:16:59 -08:00
parent eb173815f5
commit f3adb8a2f7
1 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,38 +48,38 @@ void AvatarActionHold::prepareForPhysicsSimulation() {
auto avatarManager = DependencyManager::get<AvatarManager>(); auto avatarManager = DependencyManager::get<AvatarManager>();
auto holdingAvatar = std::static_pointer_cast<Avatar>(avatarManager->getAvatarBySessionID(_holderID)); auto holdingAvatar = std::static_pointer_cast<Avatar>(avatarManager->getAvatarBySessionID(_holderID));
if (!holdingAvatar) { if (!holdingAvatar || !holdingAvatar->isMyAvatar()) {
return; return;
} }
withWriteLock([&]{ withWriteLock([&]{
if (_ignoreIK && holdingAvatar->isMyAvatar()) { if (_ignoreIK) {
return; return;
} }
if (holdingAvatar->isMyAvatar()) {
glm::vec3 palmPosition;
glm::quat palmRotation;
if (_hand == "right") {
palmPosition = holdingAvatar->getRightPalmPosition();
palmRotation = holdingAvatar->getRightPalmRotation();
} else {
palmPosition = holdingAvatar->getLeftPalmPosition();
palmRotation = holdingAvatar->getLeftPalmRotation();
}
glm::vec3 avatarRigidBodyPosition; glm::vec3 palmPosition;
glm::quat avatarRigidBodyRotation; glm::quat palmRotation;
getAvatarRigidBodyLocation(avatarRigidBodyPosition, avatarRigidBodyRotation); if (_hand == "right") {
palmPosition = holdingAvatar->getRightPalmPosition();
// determine the difference in translation and rotation between the avatar's palmRotation = holdingAvatar->getRightPalmRotation();
// rigid body and the palm position. The avatar's rigid body will be moved by bullet } else {
// between this call and the call to getTarget, below. A call to get*PalmPosition in palmPosition = holdingAvatar->getLeftPalmPosition();
// getTarget would get the palm position of the previous location of the avatar (because palmRotation = holdingAvatar->getLeftPalmRotation();
// bullet has moved the av's rigid body but the rigid body's location has not yet been
// copied out into the Avatar class.
_palmOffsetFromRigidBody = palmPosition - avatarRigidBodyPosition;
_palmRotationFromRigidBody = glm::inverse(avatarRigidBodyRotation) * palmRotation;
} }
glm::vec3 avatarRigidBodyPosition;
glm::quat avatarRigidBodyRotation;
getAvatarRigidBodyLocation(avatarRigidBodyPosition, avatarRigidBodyRotation);
// determine the difference in translation and rotation between the avatar's
// rigid body and the palm position. The avatar's rigid body will be moved by bullet
// between this call and the call to getTarget, below. A call to get*PalmPosition in
// getTarget would get the palm position of the previous location of the avatar (because
// bullet has moved the av's rigid body but the rigid body's location has not yet been
// copied out into the Avatar class.
glm::quat avatarRotationInverse = glm::inverse(avatarRigidBodyRotation);
_palmOffsetFromRigidBody = avatarRotationInverse * (palmPosition - avatarRigidBodyPosition);
_palmRotationFromRigidBody = avatarRotationInverse * palmRotation;
}); });
} }
@ -116,13 +116,8 @@ std::shared_ptr<Avatar> AvatarActionHold::getTarget(glm::quat& rotation, glm::ve
// and the data in the Avatar class is stale. This means that the result of get*PalmPosition will // and the data in the Avatar class is stale. This means that the result of get*PalmPosition will
// be stale. Instead, determine the current palm position with the current avatar's rigid body // be stale. Instead, determine the current palm position with the current avatar's rigid body
// location and the saved offsets. // location and the saved offsets.
palmPosition = avatarRigidBodyPosition + _palmOffsetFromRigidBody; palmPosition = avatarRigidBodyPosition + avatarRigidBodyRotation * _palmOffsetFromRigidBody;
palmRotation = avatarRigidBodyRotation * _palmRotationFromRigidBody; palmRotation = avatarRigidBodyRotation * _palmRotationFromRigidBody;
if (isRightHand) {
palmRotation = holdingAvatar->getRightPalmRotation();
} else {
palmRotation = holdingAvatar->getLeftPalmRotation();
}
} else { } else {
if (isRightHand) { if (isRightHand) {
palmPosition = holdingAvatar->getRightPalmPosition(); palmPosition = holdingAvatar->getRightPalmPosition();