From e114fa1b824fcac3e85f5a89e95af42937c078da Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Thu, 10 Aug 2017 09:17:46 -0700 Subject: [PATCH] fix debug traversal repeat logic --- .../src/entities/EntityTreeSendThread.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/assignment-client/src/entities/EntityTreeSendThread.cpp b/assignment-client/src/entities/EntityTreeSendThread.cpp index 48cd8ea200..bfa402e913 100644 --- a/assignment-client/src/entities/EntityTreeSendThread.cpp +++ b/assignment-client/src/entities/EntityTreeSendThread.cpp @@ -84,14 +84,10 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O bool viewFrustumChanged, bool isFullScene) { // BEGIN EXPERIMENTAL DIFFERENTIAL TRAVERSAL if (nodeData->getUsesFrustum()) { - { - // DEBUG HACK: trigger traversal (Again) every so often - const uint64_t TRAVERSE_AGAIN_PERIOD = 4 * USECS_PER_SECOND; - if (!viewFrustumChanged && usecTimestampNow() > _traversal.getStartOfCompletedTraversal() + TRAVERSE_AGAIN_PERIOD) { - viewFrustumChanged = true; - } - } - if (viewFrustumChanged) { + // DEBUG HACK: trigger traversal (Repeat) every so often + const uint64_t TRAVERSE_AGAIN_PERIOD = 4 * USECS_PER_SECOND; + bool repeatTraversal = usecTimestampNow() > _traversal.getStartOfCompletedTraversal() + TRAVERSE_AGAIN_PERIOD; + if (viewFrustumChanged || repeatTraversal) { ViewFrustum viewFrustum; nodeData->copyCurrentViewFrustum(viewFrustum); EntityTreeElementPointer root = std::dynamic_pointer_cast(_myServer->getOctree()->getRoot());