From bf27412091f81d5e4c3d6fbfc0ae2608d5c83e53 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Mon, 7 Aug 2017 12:00:10 -0700
Subject: [PATCH] cleanup

---
 .../src/entities/EntityTreeSendThread.cpp             | 11 ++---------
 assignment-client/src/entities/EntityTreeSendThread.h |  2 --
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/assignment-client/src/entities/EntityTreeSendThread.cpp b/assignment-client/src/entities/EntityTreeSendThread.cpp
index 2ecd1c6d7b..3a206dae27 100644
--- a/assignment-client/src/entities/EntityTreeSendThread.cpp
+++ b/assignment-client/src/entities/EntityTreeSendThread.cpp
@@ -167,7 +167,6 @@ void TreeTraversalPath::startNewTraversal(const ViewFrustum& viewFrustum, Entity
         };
     } else {
         _currentView = viewFrustum;
-
         _getNextElementCallback = [&]() {
             return _forks.back().getNextElementDifferential(_currentView, _completedView, _startOfCompletedTraversal);
         };
@@ -296,17 +295,14 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
         }
     }
     if (!_path.empty()) {
-        int32_t numElements = 0;
         uint64_t t0 = usecTimestampNow();
         uint64_t now = t0;
 
-        uint32_t numEntities = 0;
-        EntityTreeElementPointer nextElement = _path.getNextElement();
         const ViewFrustum& currentView = _path.getCurrentView();
         TreeTraversalPath::ConicalView conicalView(currentView);
+        EntityTreeElementPointer nextElement = _path.getNextElement();
         while (nextElement) {
             nextElement->forEachEntity([&](EntityItemPointer entity) {
-                ++numEntities;
                 bool success = false;
                 AACube cube = entity->getQueryAACube(success);
                 if (success) {
@@ -322,7 +318,6 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
                     _sendQueue.push(TreeTraversalPath::PrioritizedEntity(entity, WHEN_IN_DOUBT_PRIORITY));
                 }
             });
-            ++numElements;
 
             now = usecTimestampNow();
             const uint64_t PARTIAL_TRAVERSAL_TIME_BUDGET = 100000; // usec
@@ -348,9 +343,7 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
         // so we "clear" _sendQueue by setting it equal to an empty queue
         _sendQueue = EntityPriorityQueue();
         std::cout << "adebug -end"
-            << "  E = " << numElements
-            << "  e = " << numEntities
-            << "  Q = " << sendQueueSize
+            << "  Q.size = " << sendQueueSize
             << "  dt = " << dt1 << std::endl;  // adebug
         std::cout << "adebug" << std::endl;     // adebug
     }
diff --git a/assignment-client/src/entities/EntityTreeSendThread.h b/assignment-client/src/entities/EntityTreeSendThread.h
index a7ddf7daa1..0e41f032a9 100644
--- a/assignment-client/src/entities/EntityTreeSendThread.h
+++ b/assignment-client/src/entities/EntityTreeSendThread.h
@@ -91,14 +91,12 @@ public:
     void dump() const;
 
     const ViewFrustum& getCurrentView() const { return _currentView; }
-    //float computePriority(EntityItemPointer& entity) const { return _computePriorityCallback(entity); }
 
 protected:
     ViewFrustum _currentView;
     ViewFrustum _completedView;
     std::vector<Fork> _forks;
     std::function<EntityTreeElementPointer()> _getNextElementCallback { nullptr };
-    //std::function<float(EntityItemPointer)> _computePriorityCallback { nullptr };
     uint64_t _startOfCompletedTraversal { 0 };
     uint64_t _startOfCurrentTraversal { 0 };
 };