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

remove bodies of deleted entities

Browse source
This commit is contained in:
Andrew Meadows 2019-05-02 15:40:26 -07:00
parent af1f4364ef
commit 6e27b4d1c5
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -344,9 +344,29 @@ void PhysicalEntitySimulation::buildMotionStatesForEntitiesThatNeedThem() {
void PhysicalEntitySimulation::buildPhysicsTransaction(PhysicsEngine::Transaction& transaction) { void PhysicalEntitySimulation::buildPhysicsTransaction(PhysicsEngine::Transaction& transaction) {
QMutexLocker lock(&_mutex); QMutexLocker lock(&_mutex);
// entities being removed
for (auto entity : _entitiesToRemoveFromPhysics) {
EntityMotionState* motionState = static_cast<EntityMotionState*>(entity->getPhysicsInfo());
if (motionState) {
transaction.objectsToRemove.push_back(motionState);
_incomingChanges.remove(motionState);
}
if (_shapeRequests.size() > 0) {
ShapeRequest shapeRequest(entity);
ShapeRequests::iterator requestItr = _shapeRequests.find(shapeRequest);
if (requestItr == _shapeRequests.end()) {
_shapeRequests.erase(requestItr);
}
}
}
_entitiesToRemoveFromPhysics.clear();
// entities to add
buildMotionStatesForEntitiesThatNeedThem(); buildMotionStatesForEntitiesThatNeedThem();
// motionStates with changed entities: delete, add, or change
for (auto& object : _incomingChanges) { for (auto& object : _incomingChanges) {
uint32_t flags = object->getIncomingDirtyFlags(); uint32_t unhandledFlags = object->getIncomingDirtyFlags();
uint32_t handledFlags = EASY_DIRTY_PHYSICS_FLAGS; uint32_t handledFlags = EASY_DIRTY_PHYSICS_FLAGS;
bool isInPhysicsSimulation = object->isInPhysicsSimulation(); bool isInPhysicsSimulation = object->isInPhysicsSimulation();
@ -402,16 +422,17 @@ void PhysicalEntitySimulation::buildPhysicsTransaction(PhysicsEngine::Transactio
} else { } else {
transaction.objectsToAdd.push_back(object); transaction.objectsToAdd.push_back(object);
handledFlags = DIRTY_PHYSICS_FLAGS; handledFlags = DIRTY_PHYSICS_FLAGS;
unhandledFlags = 0;
} }
} }
if (flags & EASY_DIRTY_PHYSICS_FLAGS) { if (unhandledFlags & EASY_DIRTY_PHYSICS_FLAGS) {
object->handleEasyChanges(flags); object->handleEasyChanges(unhandledFlags);
} }
if ((flags & (Simulation::DIRTY_MOTION_TYPE | Simulation::DIRTY_COLLISION_GROUP)) || (handledFlags & Simulation::DIRTY_SHAPE)) { if (unhandledFlags & (Simulation::DIRTY_MOTION_TYPE | Simulation::DIRTY_COLLISION_GROUP | (handledFlags & Simulation::DIRTY_SHAPE))) {
transaction.objectsToReinsert.push_back(object); transaction.objectsToReinsert.push_back(object);
handledFlags |= (Simulation::DIRTY_MOTION_TYPE | Simulation::DIRTY_COLLISION_GROUP); handledFlags |= (Simulation::DIRTY_MOTION_TYPE | Simulation::DIRTY_COLLISION_GROUP);
} else if (flags & Simulation::DIRTY_PHYSICS_ACTIVATION && object->getRigidBody()->isStaticObject()) { } else if (unhandledFlags & Simulation::DIRTY_PHYSICS_ACTIVATION && object->getRigidBody()->isStaticObject()) {
transaction.activeStaticObjects.push_back(object); transaction.activeStaticObjects.push_back(object);
} }
object->clearIncomingDirtyFlags(handledFlags); object->clearIncomingDirtyFlags(handledFlags);