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	84	bool viewFrustumChanged, bool isFullScene) {
85	85	// BEGIN EXPERIMENTAL DIFFERENTIAL TRAVERSAL
86	86	if (nodeData->getUsesFrustum()) {
87		− {
88		− // DEBUG HACK: trigger traversal (Again) every so often
89		− const uint64_t TRAVERSE_AGAIN_PERIOD = 4 * USECS_PER_SECOND;
90		− if (!viewFrustumChanged && usecTimestampNow() > _traversal.getStartOfCompletedTraversal() + TRAVERSE_AGAIN_PERIOD) {
91		− viewFrustumChanged = true;
92		− }
93		− }
94		− if (viewFrustumChanged) {
	87	+ // DEBUG HACK: trigger traversal (Repeat) every so often
	88	+ const uint64_t TRAVERSE_AGAIN_PERIOD = 4 * USECS_PER_SECOND;
	89	+ bool repeatTraversal = usecTimestampNow() > _traversal.getStartOfCompletedTraversal() + TRAVERSE_AGAIN_PERIOD;
	90	+ if (viewFrustumChanged \|\| repeatTraversal) {
95	91	ViewFrustum viewFrustum;
96	92	nodeData->copyCurrentViewFrustum(viewFrustum);
97	93	EntityTreeElementPointer root = std::dynamic_pointer_cast<EntityTreeElement>(_myServer->getOctree()->getRoot());