Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 18:27:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tidy some method names per reviewer comment

Browse source
This commit is contained in:
Simon Walton 2018-08-20 17:50:29 -07:00
parent a891b74fac
commit 8d6aaf3fb5
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/octree/OctreePacketProcessor.cpp
View file

@ -112,7 +112,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer<ReceivedMessage> messag
auto renderer = qApp->getEntities(); auto renderer = qApp->getEntities();
if (renderer) { if (renderer) {
renderer->processDatagram(*message, sendingNode); renderer->processDatagram(*message, sendingNode);
_safeLanding->sequenceNumberReceived(renderer->getLastOctreeMessageSequence()); _safeLanding->noteReceivedsequenceNumber(renderer->getLastOctreeMessageSequence());
} }
} }
} break; } break;

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

@ -95,7 +95,7 @@ void SafeLanding::setCompletionSequenceNumbers(int first, int last) {
} }
} }
void SafeLanding::sequenceNumberReceived(int sequenceNumber) { void SafeLanding::noteReceivedsequenceNumber(int sequenceNumber) {
if (_trackingEntities) { if (_trackingEntities) {
Locker lock(_lock); Locker lock(_lock);
_sequenceNumbers.insert(sequenceNumber); _sequenceNumbers.insert(sequenceNumber);
@ -103,7 +103,7 @@ void SafeLanding::sequenceNumberReceived(int sequenceNumber) {
} }
bool SafeLanding::isLoadSequenceComplete() { bool SafeLanding::isLoadSequenceComplete() {
if (entityPhysicsComplete() && sequenceNumbersComplete()) { if (isEntityPhysicsComplete() && isSequenceNumbersComplete()) {
Locker lock(_lock); Locker lock(_lock);
_trackedEntities.clear(); _trackedEntities.clear();
_initialStart = INVALID_SEQUENCE; _initialStart = INVALID_SEQUENCE;
@ -116,7 +116,7 @@ bool SafeLanding::isLoadSequenceComplete() {
return !_trackingEntities; return !_trackingEntities;
} }
bool SafeLanding::sequenceNumbersComplete() { bool SafeLanding::isSequenceNumbersComplete() {
if (_initialStart != INVALID_SEQUENCE) { if (_initialStart != INVALID_SEQUENCE) {
Locker lock(_lock); Locker lock(_lock);
int sequenceSize = _initialStart <= _initialEnd ? _initialEnd - _initialStart: int sequenceSize = _initialStart <= _initialEnd ? _initialEnd - _initialStart:
@ -134,7 +134,7 @@ bool SafeLanding::sequenceNumbersComplete() {
return false; return false;
} }
bool SafeLanding::entityPhysicsComplete() { bool SafeLanding::isEntityPhysicsComplete() {
Locker lock(_lock); Locker lock(_lock);
for (auto entityMapIter = _trackedEntities.begin(); entityMapIter != _trackedEntities.end(); ++entityMapIter) { for (auto entityMapIter = _trackedEntities.begin(); entityMapIter != _trackedEntities.end(); ++entityMapIter) {
auto entity = entityMapIter->second; auto entity = entityMapIter->second;

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

@ -27,7 +27,7 @@ public:
void startEntitySequence(QSharedPointer<EntityTreeRenderer> entityTreeRenderer); void startEntitySequence(QSharedPointer<EntityTreeRenderer> entityTreeRenderer);
void stopEntitySequence(); void stopEntitySequence();
void setCompletionSequenceNumbers(int first, int last); void setCompletionSequenceNumbers(int first, int last);
void sequenceNumberReceived(int sequenceNumber); void noteReceivedsequenceNumber(int sequenceNumber);
bool isLoadSequenceComplete(); bool isLoadSequenceComplete();
private slots: private slots:
@ -35,9 +35,9 @@ private slots:
void deleteTrackedEntity(const EntityItemID& entityID); void deleteTrackedEntity(const EntityItemID& entityID);
private: private:
bool sequenceNumbersComplete(); bool isSequenceNumbersComplete();
void debugDumpSequenceIDs() const; void debugDumpSequenceIDs() const;
bool entityPhysicsComplete(); bool isEntityPhysicsComplete();
std::mutex _lock; std::mutex _lock;
using Locker = std::lock_guard<std::mutex>; using Locker = std::lock_guard<std::mutex>;