mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 08:48:53 +02:00
minor cleanup
This commit is contained in:
parent
2b31a746e3
commit
929d52276e
2 changed files with 4 additions and 10 deletions
|
@ -43,7 +43,7 @@ void PrioritizedEntity::updatePriority(const ViewFrustum& view) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// when in doubt just it something positive
|
// when in doubt give it something positive
|
||||||
_priority = 1.0f;
|
_priority = 1.0f;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -193,7 +193,8 @@ EntityTreeElementPointer TreeTraversalPath::getNextElement() {
|
||||||
_forks.pop_back();
|
_forks.pop_back();
|
||||||
if (_forks.empty()) {
|
if (_forks.empty()) {
|
||||||
// we've traversed the entire tree
|
// we've traversed the entire tree
|
||||||
onCompleteTraversal();
|
_lastCompletedView = _currentView;
|
||||||
|
_startOfLastCompletedTraversal = _startOfCurrentTraversal;
|
||||||
return nextElement;
|
return nextElement;
|
||||||
}
|
}
|
||||||
// keep looking for nextElement
|
// keep looking for nextElement
|
||||||
|
@ -213,11 +214,6 @@ void TreeTraversalPath::dump() const {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void TreeTraversalPath::onCompleteTraversal() {
|
|
||||||
_lastCompletedView = _currentView;
|
|
||||||
_startOfLastCompletedTraversal = _startOfCurrentTraversal;
|
|
||||||
}
|
|
||||||
|
|
||||||
void EntityTreeSendThread::preDistributionProcessing() {
|
void EntityTreeSendThread::preDistributionProcessing() {
|
||||||
auto node = _node.toStrongRef();
|
auto node = _node.toStrongRef();
|
||||||
auto nodeData = static_cast<EntityNodeData*>(node->getLinkedData());
|
auto nodeData = static_cast<EntityNodeData*>(node->getLinkedData());
|
||||||
|
@ -307,7 +303,7 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
|
||||||
++numElements;
|
++numElements;
|
||||||
|
|
||||||
now = usecTimestampNow();
|
now = usecTimestampNow();
|
||||||
const uint64_t PARTIAL_TRAVERSAL_TIME_BUDGET = 80;
|
const uint64_t PARTIAL_TRAVERSAL_TIME_BUDGET = 80; // usec
|
||||||
if (now - t0 > PARTIAL_TRAVERSAL_TIME_BUDGET) {
|
if (now - t0 > PARTIAL_TRAVERSAL_TIME_BUDGET) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -327,7 +323,6 @@ void EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
|
||||||
<< " numEntities = " << entities.size()
|
<< " numEntities = " << entities.size()
|
||||||
<< " dt = " << dt1 << std::endl; // adebug
|
<< " dt = " << dt1 << std::endl; // adebug
|
||||||
} else if (!_sendQueue.empty()) {
|
} else if (!_sendQueue.empty()) {
|
||||||
|
|
||||||
while (!_sendQueue.empty()) {
|
while (!_sendQueue.empty()) {
|
||||||
PrioritizedEntity entry = _sendQueue.top();
|
PrioritizedEntity entry = _sendQueue.top();
|
||||||
EntityItemPointer entity = entry.getEntity();
|
EntityItemPointer entity = entry.getEntity();
|
||||||
|
|
|
@ -74,7 +74,6 @@ protected:
|
||||||
EntityTreeElementPointer traverseFirstTime();
|
EntityTreeElementPointer traverseFirstTime();
|
||||||
EntityTreeElementPointer traverseAgain();
|
EntityTreeElementPointer traverseAgain();
|
||||||
EntityTreeElementPointer traverseDelta();
|
EntityTreeElementPointer traverseDelta();
|
||||||
void onCompleteTraversal();
|
|
||||||
|
|
||||||
ViewFrustum _currentView;
|
ViewFrustum _currentView;
|
||||||
ViewFrustum _lastCompletedView;
|
ViewFrustum _lastCompletedView;
|
||||||
|
|
Loading…
Reference in a new issue