Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 21:47:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix repeat First traversals mid-First-traversal

Browse source
This commit is contained in:
Andrew Meadows 2017-08-24 17:33:51 -07:00
parent d54fa205fb
commit b788273f47
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
assignment-client/src/entities/EntityTreeSendThread.cpp
View file

@ -17,7 +17,7 @@
#include "EntityServer.h" #include "EntityServer.h"
//#define SEND_SORTED_ENTITIES #define SEND_SORTED_ENTITIES
void EntityTreeSendThread::preDistributionProcessing() { void EntityTreeSendThread::preDistributionProcessing() {
auto node = _node.toStrongRef(); auto node = _node.toStrongRef();
@ -89,7 +89,7 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
if (nodeData->getUsesFrustum()) { if (nodeData->getUsesFrustum()) {
// DEBUG HACK: trigger traversal (Repeat) every so often // DEBUG HACK: trigger traversal (Repeat) every so often
const uint64_t TRAVERSE_AGAIN_PERIOD = 4 * USECS_PER_SECOND; const uint64_t TRAVERSE_AGAIN_PERIOD = 4 * USECS_PER_SECOND;
bool repeatTraversal = usecTimestampNow() > _traversal.getStartOfCompletedTraversal() + TRAVERSE_AGAIN_PERIOD; bool repeatTraversal = _traversal.finished() && usecTimestampNow() > _traversal.getStartOfCompletedTraversal() + TRAVERSE_AGAIN_PERIOD;
if (viewFrustumChanged || repeatTraversal) { if (viewFrustumChanged || repeatTraversal) {
ViewFrustum viewFrustum; ViewFrustum viewFrustum;
nodeData->copyCurrentViewFrustum(viewFrustum); nodeData->copyCurrentViewFrustum(viewFrustum);
@ -272,8 +272,8 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree
break; break;
case DiffTraversal::Repeat: case DiffTraversal::Repeat:
_traversal.setScanCallback([&] (DiffTraversal::VisibleElement& next) { _traversal.setScanCallback([&] (DiffTraversal::VisibleElement& next) {
if (next.element->getLastChangedContent() > _traversal.getStartOfCompletedTraversal()) { uint64_t timestamp = _traversal.getStartOfCompletedTraversal();
uint64_t timestamp = _traversal.getStartOfCompletedTraversal(); if (next.element->getLastChangedContent() > timestamp) {
next.element->forEachEntity([&](EntityItemPointer entity) { next.element->forEachEntity([&](EntityItemPointer entity) {
// Bail early if we've already checked this entity this frame // Bail early if we've already checked this entity this frame
if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) { if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {