Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-15 06:26:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6877 from AndrewMeadows/crash-fix

Browse source 
fix interface crash when deleting lots of objects at once
This commit is contained in:
Brad Hefta-Gaub 2016-01-21 16:49:21 -08:00
commit 1a98ab3fba
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -142,6 +142,7 @@ void PhysicalEntitySimulation::clearEntitiesInternal() {
// finally clear all lists maintained by this class // finally clear all lists maintained by this class
_physicalObjects.clear(); _physicalObjects.clear();
_entitiesToRemoveFromPhysics.clear(); _entitiesToRemoveFromPhysics.clear();
_entitiesToRelease.clear();
_entitiesToAddToPhysics.clear(); _entitiesToAddToPhysics.clear();
_pendingChanges.clear(); _pendingChanges.clear();
_outgoingChanges.clear(); _outgoingChanges.clear();
@ -157,6 +158,7 @@ void PhysicalEntitySimulation::prepareEntityForDelete(EntityItemPointer entity)
// end EntitySimulation overrides // end EntitySimulation overrides
void PhysicalEntitySimulation::getObjectsToRemoveFromPhysics(VectorOfMotionStates& result) { void PhysicalEntitySimulation::getObjectsToRemoveFromPhysics(VectorOfMotionStates& result) {
_entitiesToRelease.clear();
result.clear(); result.clear();
QMutexLocker lock(&_mutex); QMutexLocker lock(&_mutex);
for (auto entity: _entitiesToRemoveFromPhysics) { for (auto entity: _entitiesToRemoveFromPhysics) {
@ -171,7 +173,7 @@ void PhysicalEntitySimulation::getObjectsToRemoveFromPhysics(VectorOfMotionState
_entitiesToDelete.insert(entity); _entitiesToDelete.insert(entity);
} }
} }
_entitiesToRemoveFromPhysics.clear(); _entitiesToRemoveFromPhysics.swap(_entitiesToRelease);
} }
void PhysicalEntitySimulation::getObjectsToAddToPhysics(VectorOfMotionStates& result) { void PhysicalEntitySimulation::getObjectsToAddToPhysics(VectorOfMotionStates& result) {

3
libraries/physics/src/PhysicalEntitySimulation.h
View file

@ -60,6 +60,7 @@ public:
private: private:
SetOfEntities _entitiesToRemoveFromPhysics; SetOfEntities _entitiesToRemoveFromPhysics;
SetOfEntities _entitiesToRelease;
SetOfEntities _entitiesToAddToPhysics; SetOfEntities _entitiesToAddToPhysics;
SetOfEntityMotionStates _pendingChanges; // EntityMotionStates already in PhysicsEngine that need their physics changed SetOfEntityMotionStates _pendingChanges; // EntityMotionStates already in PhysicsEngine that need their physics changed
@ -70,7 +71,7 @@ private:
PhysicsEnginePointer _physicsEngine = nullptr; PhysicsEnginePointer _physicsEngine = nullptr;
EntityEditPacketSender* _entityPacketSender = nullptr; EntityEditPacketSender* _entityPacketSender = nullptr;
uint32_t _lastStepSendPackets = 0; uint32_t _lastStepSendPackets { 0 };
}; };