From 2cfb835b569bb3cff171202dd038fb2b9031946c Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 6 Apr 2018 15:26:33 -0700 Subject: [PATCH] only add to physics simulation that when necessary --- libraries/physics/src/PhysicalEntitySimulation.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/physics/src/PhysicalEntitySimulation.cpp b/libraries/physics/src/PhysicalEntitySimulation.cpp index f05f5a94f5..6045b766d9 100644 --- a/libraries/physics/src/PhysicalEntitySimulation.cpp +++ b/libraries/physics/src/PhysicalEntitySimulation.cpp @@ -48,7 +48,9 @@ void PhysicalEntitySimulation::addEntityInternal(EntityItemPointer entity) { QMutexLocker lock(&_mutex); assert(entity); assert(!entity->isDead()); - if (entity->shouldBePhysical()) { + uint8_t region = _space->getRegion(entity->getSpaceIndex()); + bool shouldBePhysical = region < workload::Region::R3 && entity->shouldBePhysical(); + if (shouldBePhysical) { EntityMotionState* motionState = static_cast(entity->getPhysicsInfo()); if (!motionState) { _entitiesToAddToPhysics.insert(entity);