From bbde1bcd632767466478fdc001350f7257f5cd80 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 9 Oct 2017 10:42:42 -0700
Subject: [PATCH] move stuff out of writelock when possible

---
 interface/src/Application.cpp | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 835a2fed56..527e3607f5 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5643,20 +5643,18 @@ bool Application::nearbyEntitiesAreReadyForPhysics() {
     // whose bounding boxes cannot be computed (it is too loose for our purposes here).  Instead we manufacture
     // custom filters and use the general-purpose EntityTree::findEntities(filter, ...)
     QVector<EntityItemPointer> entities;
-    entityTree->withReadLock([&] {
-        AABox avatarBox(getMyAvatar()->getPosition() - glm::vec3(PHYSICS_READY_RANGE), glm::vec3(2 * PHYSICS_READY_RANGE));
-
-        // create two functions that use avatarBox (entityScan and elementScan), the second calls the first
-        std::function<bool (EntityItemPointer&)> entityScan = [=](EntityItemPointer& entity) {
-                if (entity->shouldBePhysical()) {
-                    bool success = false;
-                    AABox entityBox = entity->getAABox(success);
-                    // important: bail for entities that cannot supply a valid AABox
-                    return success && avatarBox.touches(entityBox);
-                }
-                return false;
-            };
-        std::function<bool(const OctreeElementPointer&, void*)> elementScan = [&](const OctreeElementPointer& element, void* unused) {
+    AABox avatarBox(getMyAvatar()->getPosition() - glm::vec3(PHYSICS_READY_RANGE), glm::vec3(2 * PHYSICS_READY_RANGE));
+    // create two functions that use avatarBox (entityScan and elementScan), the second calls the first
+    std::function<bool (EntityItemPointer&)> entityScan = [=](EntityItemPointer& entity) {
+            if (entity->shouldBePhysical()) {
+                bool success = false;
+                AABox entityBox = entity->getAABox(success);
+                // important: bail for entities that cannot supply a valid AABox
+                return success && avatarBox.touches(entityBox);
+            }
+            return false;
+        };
+    std::function<bool(const OctreeElementPointer&, void*)> elementScan = [&](const OctreeElementPointer& element, void* unused) {
             if (element->getAACube().touches(avatarBox)) {
                 EntityTreeElementPointer entityTreeElement = std::static_pointer_cast<EntityTreeElement>(element);
                 entityTreeElement->getEntities(entityScan, entities);
@@ -5665,6 +5663,7 @@ bool Application::nearbyEntitiesAreReadyForPhysics() {
             return false;
         };
 
+    entityTree->withReadLock([&] {
         // Pass the second function to the general-purpose EntityTree::findEntities()
         // which will traverse the tree, apply the two filter functions (to element, then to entities)
         // as it traverses.  The end result will be a list of entities that match.