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

activate body before disconnecting action from entity

Browse source
This commit is contained in:
Andrew Meadows 2018-05-29 17:56:12 -07:00
parent 5d3502ed88
commit bc57003cfb
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -159,6 +159,13 @@ void ObjectDynamic::removeFromSimulation(EntitySimulationPointer simulation) con
simulation->removeDynamic(myID); simulation->removeDynamic(myID);
} }
void ObjectDynamic::setOwnerEntity(const EntityItemPointer ownerEntity) {
if (!ownerEntity) {
activateBody();
}
_ownerEntity = ownerEntity;
}
EntityItemPointer ObjectDynamic::getEntityByID(EntityItemID entityID) const { EntityItemPointer ObjectDynamic::getEntityByID(EntityItemID entityID) const {
EntityItemPointer ownerEntity; EntityItemPointer ownerEntity;
withReadLock([&]{ withReadLock([&]{

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

@ -33,7 +33,7 @@ public:
virtual void removeFromSimulation(EntitySimulationPointer simulation) const override; virtual void removeFromSimulation(EntitySimulationPointer simulation) const override;
virtual EntityItemWeakPointer getOwnerEntity() const override { return _ownerEntity; } virtual EntityItemWeakPointer getOwnerEntity() const override { return _ownerEntity; }
virtual void setOwnerEntity(const EntityItemPointer ownerEntity) override { _ownerEntity = ownerEntity; } virtual void setOwnerEntity(const EntityItemPointer ownerEntity) override;
virtual void invalidate() {}; virtual void invalidate() {};

1
libraries/physics/src/PhysicsEngine.cpp
View file

@ -776,7 +776,6 @@ void PhysicsEngine::removeDynamic(const QUuid dynamicID) {
_objectDynamics.remove(dynamicID); _objectDynamics.remove(dynamicID);
foreach(btRigidBody* rigidBody, rigidBodies) { foreach(btRigidBody* rigidBody, rigidBodies) {
_objectDynamicsByBody[rigidBody].remove(dynamic->getID()); _objectDynamicsByBody[rigidBody].remove(dynamic->getID());
rigidBody->activate();
} }
dynamic->invalidate(); dynamic->invalidate();
} }