History

fix debug traversal repeat logic

Andrew Meadows committed 9 years ago

Commit e114fa11 parent 3e50d011 file · +4 −8Browse files

Showing the changes to assignment-client/src/entities/EntityTreeSendThread.cpp (1 of 1 file). Show all

Unified · Split

assignment-client/src/entities/EntityTreeSendThread.cpp+4−8
@@ -84,14 +84,10 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O · 83 unmodified lines
84 bool viewFrustumChanged, bool isFullScene) {84 bool viewFrustumChanged, bool isFullScene) {
85 // BEGIN EXPERIMENTAL DIFFERENTIAL TRAVERSAL85 // BEGIN EXPERIMENTAL DIFFERENTIAL TRAVERSAL
86 if (nodeData->getUsesFrustum()) {86 if (nodeData->getUsesFrustum()) {
87 {87 // DEBUG HACK: trigger traversal (Repeat) every so often
88 // DEBUG HACK: trigger traversal (Again) every so often88 const uint64_t TRAVERSE_AGAIN_PERIOD = 4 * USECS_PER_SECOND;
89 const uint64_t TRAVERSE_AGAIN_PERIOD = 4 * USECS_PER_SECOND;89 bool repeatTraversal = usecTimestampNow() > _traversal.getStartOfCompletedTraversal() + TRAVERSE_AGAIN_PERIOD;
90 if (!viewFrustumChanged && usecTimestampNow() > _traversal.getStartOfCompletedTraversal() + TRAVERSE_AGAIN_PERIOD) {90 if (viewFrustumChanged || repeatTraversal) {
91 viewFrustumChanged = true;
92 }
93 }
94 if (viewFrustumChanged) {
95 ViewFrustum viewFrustum;91 ViewFrustum viewFrustum;
96 nodeData->copyCurrentViewFrustum(viewFrustum);92 nodeData->copyCurrentViewFrustum(viewFrustum);
97 EntityTreeElementPointer root = std::dynamic_pointer_cast<EntityTreeElement>(_myServer->getOctree()->getRoot());93 EntityTreeElementPointer root = std::dynamic_pointer_cast<EntityTreeElement>(_myServer->getOctree()->getRoot());

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t