diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp index f740995123..4bc6817a9e 100644 --- a/interface/src/octree/OctreePacketProcessor.cpp +++ b/interface/src/octree/OctreePacketProcessor.cpp @@ -112,7 +112,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer messag auto renderer = qApp->getEntities(); if (renderer) { renderer->processDatagram(*message, sendingNode); - _safeLanding->sequenceNumberReceived(renderer->getLastOctreeMessageSequence()); + _safeLanding->noteReceivedsequenceNumber(renderer->getLastOctreeMessageSequence()); } } } break; diff --git a/interface/src/octree/SafeLanding.cpp b/interface/src/octree/SafeLanding.cpp index 3568dade08..31106457fb 100644 --- a/interface/src/octree/SafeLanding.cpp +++ b/interface/src/octree/SafeLanding.cpp @@ -95,7 +95,7 @@ void SafeLanding::setCompletionSequenceNumbers(int first, int last) { } } -void SafeLanding::sequenceNumberReceived(int sequenceNumber) { +void SafeLanding::noteReceivedsequenceNumber(int sequenceNumber) { if (_trackingEntities) { Locker lock(_lock); _sequenceNumbers.insert(sequenceNumber); @@ -103,7 +103,7 @@ void SafeLanding::sequenceNumberReceived(int sequenceNumber) { } bool SafeLanding::isLoadSequenceComplete() { - if (entityPhysicsComplete() && sequenceNumbersComplete()) { + if (isEntityPhysicsComplete() && isSequenceNumbersComplete()) { Locker lock(_lock); _trackedEntities.clear(); _initialStart = INVALID_SEQUENCE; @@ -116,7 +116,7 @@ bool SafeLanding::isLoadSequenceComplete() { return !_trackingEntities; } -bool SafeLanding::sequenceNumbersComplete() { +bool SafeLanding::isSequenceNumbersComplete() { if (_initialStart != INVALID_SEQUENCE) { Locker lock(_lock); int sequenceSize = _initialStart <= _initialEnd ? _initialEnd - _initialStart: @@ -134,7 +134,7 @@ bool SafeLanding::sequenceNumbersComplete() { return false; } -bool SafeLanding::entityPhysicsComplete() { +bool SafeLanding::isEntityPhysicsComplete() { Locker lock(_lock); for (auto entityMapIter = _trackedEntities.begin(); entityMapIter != _trackedEntities.end(); ++entityMapIter) { auto entity = entityMapIter->second; diff --git a/interface/src/octree/SafeLanding.h b/interface/src/octree/SafeLanding.h index 64de50b883..210dfbac25 100644 --- a/interface/src/octree/SafeLanding.h +++ b/interface/src/octree/SafeLanding.h @@ -27,7 +27,7 @@ public: void startEntitySequence(QSharedPointer entityTreeRenderer); void stopEntitySequence(); void setCompletionSequenceNumbers(int first, int last); - void sequenceNumberReceived(int sequenceNumber); + void noteReceivedsequenceNumber(int sequenceNumber); bool isLoadSequenceComplete(); private slots: @@ -35,9 +35,9 @@ private slots: void deleteTrackedEntity(const EntityItemID& entityID); private: - bool sequenceNumbersComplete(); + bool isSequenceNumbersComplete(); void debugDumpSequenceIDs() const; - bool entityPhysicsComplete(); + bool isEntityPhysicsComplete(); std::mutex _lock; using Locker = std::lock_guard;