From 8c512ec19bd8c13443faa388f48e0ec5e9781d23 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Mon, 30 Jul 2018 18:03:45 -0700
Subject: [PATCH] Send spherical view from Interface rather than creating in ES

---
 .../src/entities/EntityTreeSendThread.cpp     | 12 +---------
 .../src/entities/EntityTreeSendThread.h       |  2 --
 interface/src/Application.cpp                 | 22 ++++++++++++++-----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/assignment-client/src/entities/EntityTreeSendThread.cpp b/assignment-client/src/entities/EntityTreeSendThread.cpp
index 6079f03c26..2e777ae0f1 100644
--- a/assignment-client/src/entities/EntityTreeSendThread.cpp
+++ b/assignment-client/src/entities/EntityTreeSendThread.cpp
@@ -17,9 +17,6 @@
 
 #include "EntityServer.h"
 
-// Initially just send all items within this distance.
-const float EntityTreeSendThread::INITIAL_RADIUS = 10.0f;
-
 EntityTreeSendThread::EntityTreeSendThread(OctreeServer* myServer, const SharedNodePointer& node) :
     OctreeSendThread(myServer, node)
 {
@@ -113,14 +110,7 @@ bool EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
 
         int32_t lodLevelOffset = nodeData->getBoundaryLevelAdjust() + (viewFrustumChanged ? LOW_RES_MOVING_ADJUST : NO_BOUNDARY_ADJUST);
         newView.lodScaleFactor = powf(2.0f, lodLevelOffset);
-
-        if (nodeData->wantReportInitialCompletion() && !newView.viewFrustums.empty()) {
-            auto& mainView = newView.viewFrustums[0];
-            // Force acceptance within INITIAL_RADIUS.
-            mainView.setSimpleRadius(INITIAL_RADIUS);
-            newView.lodScaleFactor = 0.0f;
-        }
-
+        
         startNewTraversal(newView, root);
 
         // When the viewFrustum changed the sort order may be incorrect, so we re-sort
diff --git a/assignment-client/src/entities/EntityTreeSendThread.h b/assignment-client/src/entities/EntityTreeSendThread.h
index c9f4d06164..199769ca09 100644
--- a/assignment-client/src/entities/EntityTreeSendThread.h
+++ b/assignment-client/src/entities/EntityTreeSendThread.h
@@ -58,8 +58,6 @@ private:
     int32_t _numEntitiesOffset { 0 };
     uint16_t _numEntities { 0 };
 
-    const static float INITIAL_RADIUS;
-
 private slots:
     void editingEntityPointer(const EntityItemPointer& entity);
     void deletingEntityPointer(EntityItem* entity);
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 0037c9500f..bbb8dc8161 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -374,6 +374,7 @@ static const int THROTTLED_SIM_FRAME_PERIOD_MS = MSECS_PER_SECOND / THROTTLED_SI
 static const uint32_t INVALID_FRAME = UINT32_MAX;
 
 static const float PHYSICS_READY_RANGE = 3.0f; // how far from avatar to check for entities that aren't ready for simulation
+static const float INITIAL_QUERY_RADIUS = 10.0f;  // priority radius for entities before physics enabled
 
 static const QString DESKTOP_LOCATION = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
 
@@ -6130,12 +6131,23 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType) {
         return; // bail early if settings are not loaded
     }
 
-    _octreeQuery.setConicalViews(_conicalViews);
+    const bool isModifiedQuery = !_physicsEnabled;
+    if (isModifiedQuery) {
+        // Create modified view that is a simple sphere.
+        ConicalViewFrustum sphericalView;
+        sphericalView.setSimpleRadius(INITIAL_QUERY_RADIUS);
+        _octreeQuery.setConicalViews({ sphericalView });
+        _octreeQuery.setOctreeSizeScale(DEFAULT_OCTREE_SIZE_SCALE);
+        static constexpr float MIN_LOD_ADJUST = -20.0f;
+        _octreeQuery.setBoundaryLevelAdjust(MIN_LOD_ADJUST);
+    } else {
+        _octreeQuery.setConicalViews(_conicalViews);
+        auto lodManager = DependencyManager::get<LODManager>();
+        _octreeQuery.setOctreeSizeScale(lodManager->getOctreeSizeScale());
+        _octreeQuery.setBoundaryLevelAdjust(lodManager->getBoundaryLevelAdjust());
+    }
+    _octreeQuery.setReportInitialCompletion(isModifiedQuery);
 
-    auto lodManager = DependencyManager::get<LODManager>();
-    _octreeQuery.setOctreeSizeScale(lodManager->getOctreeSizeScale());
-    _octreeQuery.setBoundaryLevelAdjust(lodManager->getBoundaryLevelAdjust());
-    _octreeQuery.setReportInitialCompletion(!_physicsEnabled);
 
     auto nodeList = DependencyManager::get<NodeList>();