From 1b1ae48650cf687d6cfd944de7380ca777f431a6 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 30 Jan 2017 17:01:45 -0800 Subject: [PATCH] don't recurse on octree elements that have not changed --- libraries/octree/src/Octree.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp index d2d7aba517..58910c66bd 100644 --- a/libraries/octree/src/Octree.cpp +++ b/libraries/octree/src/Octree.cpp @@ -1084,17 +1084,17 @@ int Octree::encodeTreeBitstreamRecursion(OctreeElementPointer element, params.stopReason = EncodeBitstreamParams::WAS_IN_VIEW; return bytesAtThisLevel; } + } - // If we're not in delta sending mode, and we weren't asked to do a force send, and the voxel hasn't changed, - // then we can also bail early and save bits - if (!params.forceSendScene && !params.deltaView && - !element->hasChangedSince(params.lastQuerySent - CHANGE_FUDGE)) { - if (params.stats) { - params.stats->skippedNoChange(element); - } - params.stopReason = EncodeBitstreamParams::NO_CHANGE; - return bytesAtThisLevel; + // If we're not in delta sending mode, and we weren't asked to do a force send, and the octree element hasn't changed, + // then we can also bail early and save bits + if (!params.forceSendScene && !params.deltaView && + !element->hasChangedSince(params.lastQuerySent - CHANGE_FUDGE)) { + if (params.stats) { + params.stats->skippedNoChange(element); } + params.stopReason = EncodeBitstreamParams::NO_CHANGE; + return bytesAtThisLevel; } bool keepDiggingDeeper = true; // Assuming we're in view we have a great work ethic, we're always ready for more!