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

Merge pull request #6783 from sethalves/fix-h0ld-action

Browse source 
try harder to ensure that a held object is active in bullet
This commit is contained in:
Andrew Meadows 2016-01-07 10:53:55 -08:00
commit 8ae1e750ab
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,7 +90,7 @@ void AvatarActionHold::prepareForPhysicsSimulation() {
// _palmRotationFromRigidBody = avatarRotationInverse * palmRotation; // _palmRotationFromRigidBody = avatarRotationInverse * palmRotation;
}); });
activateBody(); activateBody(true);
} }
std::shared_ptr<Avatar> AvatarActionHold::getTarget(glm::quat& rotation, glm::vec3& position) { std::shared_ptr<Avatar> AvatarActionHold::getTarget(glm::quat& rotation, glm::vec3& position) {

7
libraries/physics/src/ObjectAction.cpp
View file

@ -237,10 +237,13 @@ void ObjectAction::setAngularVelocity(glm::vec3 angularVelocity) {
rigidBody->activate(); rigidBody->activate();
} }
void ObjectAction::activateBody() { void ObjectAction::activateBody(bool forceActivation) {
auto rigidBody = getRigidBody(); auto rigidBody = getRigidBody();
if (rigidBody) { if (rigidBody) {
rigidBody->activate(); rigidBody->activate(forceActivation);
assert(rigidBody->isActive());
} else {
qDebug() << "ObjectAction::activateBody -- no rigid body" << (void*)rigidBody;
} }
} }

2
libraries/physics/src/ObjectAction.h
View file

@ -62,7 +62,7 @@ protected:
virtual void setLinearVelocity(glm::vec3 linearVelocity) override; virtual void setLinearVelocity(glm::vec3 linearVelocity) override;
virtual glm::vec3 getAngularVelocity() override; virtual glm::vec3 getAngularVelocity() override;
virtual void setAngularVelocity(glm::vec3 angularVelocity) override; virtual void setAngularVelocity(glm::vec3 angularVelocity) override;
virtual void activateBody(); virtual void activateBody(bool forceActivation = false);
virtual void forceBodyNonStatic(); virtual void forceBodyNonStatic();
EntityItemWeakPointer _ownerEntity; EntityItemWeakPointer _ownerEntity;