Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 09:54:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow for removal and readdition of an action in one time-slice without asserting

Browse source
This commit is contained in:
Seth Alves 2015-06-29 12:22:06 -07:00
parent 3e88e1f400
commit c539d9f233
2 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/entities/src/EntitySimulation.cpp
View file

@ -263,22 +263,6 @@ void EntitySimulation::moveSimpleKinematics(const quint64& now) {
void EntitySimulation::addAction(EntityActionPointer action) { void EntitySimulation::addAction(EntityActionPointer action) {
lock(); lock();
#if DEBUG
foreach (EntityActionPointer actionToAdd, _actionsToAdd) {
if (actionToAdd->getID() == action->getID()) {
qDebug() << "action added to add-list more than once";
assert(false);
}
}
foreach (QUuid actionToRemoveID, _actionsToRemove) {
if (actionToRemoveID == action->getID()) {
qDebug() << "action added to add-list and remove-list";
assert(false);
}
}
#endif
_actionsToAdd += action; _actionsToAdd += action;
unlock(); unlock();
} }

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

@ -251,16 +251,16 @@ void PhysicalEntitySimulation::addAction(EntityActionPointer action) {
void PhysicalEntitySimulation::applyActionChanges() { void PhysicalEntitySimulation::applyActionChanges() {
if (_physicsEngine) { if (_physicsEngine) {
lock(); lock();
foreach (QUuid actionToRemove, _actionsToRemove) {
_physicsEngine->removeAction(actionToRemove);
}
_actionsToRemove.clear();
foreach (EntityActionPointer actionToAdd, _actionsToAdd) { foreach (EntityActionPointer actionToAdd, _actionsToAdd) {
if (!_actionsToRemove.contains(actionToAdd->getID())) { if (!_actionsToRemove.contains(actionToAdd->getID())) {
_physicsEngine->addAction(actionToAdd); _physicsEngine->addAction(actionToAdd);
} }
} }
_actionsToAdd.clear(); _actionsToAdd.clear();
foreach (QUuid actionToRemove, _actionsToRemove) {
_physicsEngine->removeAction(actionToRemove);
}
_actionsToRemove.clear();
unlock(); unlock();
} }
} }