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

back out off-brand change

Browse source
This commit is contained in:
Seth Alves 2016-01-03 07:33:50 -08:00
parent 9145a8a753
commit 86b551c177
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,8 +89,6 @@ void AvatarActionHold::prepareForPhysicsSimulation() {
// code here for future reference. // code here for future reference.
// _palmRotationFromRigidBody = avatarRotationInverse * palmRotation; // _palmRotationFromRigidBody = avatarRotationInverse * palmRotation;
}); });
activateBody();
} }
std::shared_ptr<Avatar> AvatarActionHold::getTarget(glm::quat& rotation, glm::vec3& position) { std::shared_ptr<Avatar> AvatarActionHold::getTarget(glm::quat& rotation, glm::vec3& position) {
@ -199,6 +197,7 @@ void AvatarActionHold::updateActionWorker(float deltaTimeStep) {
if (_kinematic) { if (_kinematic) {
doKinematicUpdate(deltaTimeStep); doKinematicUpdate(deltaTimeStep);
} else { } else {
activateBody();
forceBodyNonStatic(); forceBodyNonStatic();
ObjectActionSpring::updateActionWorker(deltaTimeStep); ObjectActionSpring::updateActionWorker(deltaTimeStep);
} }
@ -248,6 +247,7 @@ void AvatarActionHold::doKinematicUpdate(float deltaTimeStep) {
_previousSet = true; _previousSet = true;
}); });
activateBody();
forceBodyNonStatic(); forceBodyNonStatic();
} }
@ -344,6 +344,7 @@ bool AvatarActionHold::updateArguments(QVariantMap arguments) {
ownerEntity->setActionDataNeedsTransmit(true); ownerEntity->setActionDataNeedsTransmit(true);
} }
}); });
activateBody();
} }
return true; return true;
@ -430,5 +431,6 @@ void AvatarActionHold::deserialize(QByteArray serializedArguments) {
_active = true; _active = true;
}); });
activateBody();
forceBodyNonStatic(); forceBodyNonStatic();
} }