Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 23:09:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6 from danteruiz/revert-loagic-chnage

Browse source 
Reverting bad logic
This commit is contained in:
Wayne Chen 2018-10-03 15:32:58 -07:00 committed by GitHub
commit f875bfd0d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/octree/SafeLanding.cpp
View file

@ -116,10 +116,9 @@ bool SafeLanding::isLoadSequenceComplete() {
_initialEnd = INVALID_SEQUENCE; _initialEnd = INVALID_SEQUENCE;
_entityTree = nullptr; _entityTree = nullptr;
EntityTreeRenderer::setEntityLoadingPriorityFunction(StandardPriority); EntityTreeRenderer::setEntityLoadingPriorityFunction(StandardPriority);
return true;
} }
return false; return !_trackingEntities;
} }
float SafeLanding::loadingProgressPercentage() { float SafeLanding::loadingProgressPercentage() {
@ -150,9 +149,10 @@ bool SafeLanding::isSequenceNumbersComplete() {
&& endIter != _sequenceNumbers.end() && endIter != _sequenceNumbers.end()
&& distance(startIter, endIter) == sequenceSize - 1)) { && distance(startIter, endIter) == sequenceSize - 1)) {
_trackingEntities = false; // Don't track anything else that comes in. _trackingEntities = false; // Don't track anything else that comes in.
return true;
} }
} }
return !_trackingEntities; return false;
} }
bool isEntityPhysicsReady(const EntityItemPointer& entity) { bool isEntityPhysicsReady(const EntityItemPointer& entity) {