From 929d52276e6fa8a108a134dd675a96c3675227f2 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 26 Jul 2017 09:03:57 -0700
Subject: [PATCH] minor cleanup

---
 .../src/entities/EntityTreeSendThread.cpp           | 13 ++++---------
 .../src/entities/EntityTreeSendThread.h             |  1 -
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/assignment-client/src/entities/EntityTreeSendThread.cpp b/assignment-client/src/entities/EntityTreeSendThread.cpp
index b971634d7e..34b1c6e123 100644
--- a/assignment-client/src/entities/EntityTreeSendThread.cpp
+++ b/assignment-client/src/entities/EntityTreeSendThread.cpp
@@ -43,7 +43,7 @@ void PrioritizedEntity::updatePriority(const ViewFrustum& view) {
                 }
             }
         } else {
-            // when in doubt just it something positive
+            // when in doubt give it something positive
             _priority = 1.0f;
         }
     } else {
@@ -193,7 +193,8 @@ EntityTreeElementPointer TreeTraversalPath::getNextElement() {
             _forks.pop_back();
             if (_forks.empty()) {
                 // we've traversed the entire tree
-                onCompleteTraversal();
+                _lastCompletedView = _currentView;
+                _startOfLastCompletedTraversal = _startOfCurrentTraversal;
                 return nextElement;
             }
             // keep looking for nextElement
@@ -213,11 +214,6 @@ void TreeTraversalPath::dump() const {
     }
 }
 
-void TreeTraversalPath::onCompleteTraversal() {
-    _lastCompletedView = _currentView;
-    _startOfLastCompletedTraversal = _startOfCurrentTraversal;
-}
-
 void EntityTreeSendThread::preDistributionProcessing() {
     auto node = _node.toStrongRef();
     auto nodeData = static_cast<EntityNodeData*>(node->getLinkedData());
@@ -307,7 +303,7 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
             ++numElements;
 
             now = usecTimestampNow();
-            const uint64_t PARTIAL_TRAVERSAL_TIME_BUDGET = 80;
+            const uint64_t PARTIAL_TRAVERSAL_TIME_BUDGET = 80; // usec
             if (now - t0 > PARTIAL_TRAVERSAL_TIME_BUDGET) {
                 break;
             }
@@ -327,7 +323,6 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
             << "  numEntities = " << entities.size()
             << "  dt = " << dt1 << std::endl;  // adebug
     } else if (!_sendQueue.empty()) {
-
         while (!_sendQueue.empty()) {
             PrioritizedEntity entry = _sendQueue.top();
             EntityItemPointer entity = entry.getEntity();
diff --git a/assignment-client/src/entities/EntityTreeSendThread.h b/assignment-client/src/entities/EntityTreeSendThread.h
index e81105c977..dd072454b9 100644
--- a/assignment-client/src/entities/EntityTreeSendThread.h
+++ b/assignment-client/src/entities/EntityTreeSendThread.h
@@ -74,7 +74,6 @@ protected:
     EntityTreeElementPointer traverseFirstTime();
     EntityTreeElementPointer traverseAgain();
     EntityTreeElementPointer traverseDelta();
-    void onCompleteTraversal();
 
     ViewFrustum _currentView;
     ViewFrustum _lastCompletedView;