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

lock when reading or writing _actionsToAdd or _actionsToRemove

Browse source
This commit is contained in:
Seth Alves 2015-06-22 07:19:40 -07:00
parent 03a2d190b0
commit c14276145d
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities/src/EntitySimulation.h
View file

@ -57,10 +57,10 @@ public:
friend class EntityTree;
virtual void addAction(EntityActionPointer action) { _actionsToAdd += action; }
virtual void removeAction(const QUuid actionID) { _actionsToRemove += actionID; }
virtual void removeActions(QList<QUuid> actionIDsToRemove) { _actionsToRemove += actionIDsToRemove; }
virtual void applyActionChanges() { _actionsToAdd.clear(); _actionsToRemove.clear(); }
virtual void addAction(EntityActionPointer action) { lock(); _actionsToAdd += action; unlock(); }
virtual void removeAction(const QUuid actionID) { lock(); _actionsToRemove += actionID; unlock(); }
virtual void removeActions(QList<QUuid> actionIDsToRemove) { lock(); _actionsToRemove += actionIDsToRemove; unlock(); }
virtual void applyActionChanges() { lock(); _actionsToAdd.clear(); _actionsToRemove.clear(); unlock(); }
protected: // these only called by the EntityTree?
/// \param entity pointer to EntityItem to be added

5
libraries/physics/src/PhysicalEntitySimulation.cpp
View file

@ -237,12 +237,15 @@ void PhysicalEntitySimulation::handleCollisionEvents(CollisionEvents& collisionE
void PhysicalEntitySimulation::applyActionChanges() {
if (_physicsEngine) {
lock();
foreach (EntityActionPointer actionToAdd, _actionsToAdd) {
_physicsEngine->addAction(actionToAdd);
}
_actionsToAdd.clear();
foreach (QUuid actionToRemove, _actionsToRemove) {
_physicsEngine->removeAction(actionToRemove);
}
_actionsToRemove.clear();
unlock();
}
EntitySimulation::applyActionChanges();
}