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

indent switch statement, use const ref

Browse source
This commit is contained in:
Andrew Meadows 2017-09-25 17:41:14 -07:00
parent 32910e6f40
commit 01304de8c2
2 changed files with 146 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assignment-client/src/entities/EntityTreeSendThread.cpp
View file

@ -255,8 +255,8 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree
}); });
}); });
} else { } else {
_traversal.setScanCallback([=](DiffTraversal::VisibleElement& next) { _traversal.setScanCallback([this](DiffTraversal::VisibleElement& next) {
next.element->forEachEntity([&](EntityItemPointer entity) { next.element->forEachEntity([this](EntityItemPointer entity) {
// Bail early if we've already checked this entity this frame // Bail early if we've already checked this entity this frame
if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) { if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
return; return;
@ -308,10 +308,10 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree
} }
}); });
} else { } else {
_traversal.setScanCallback([=](DiffTraversal::VisibleElement& next) { _traversal.setScanCallback([this](DiffTraversal::VisibleElement& next) {
uint64_t startOfCompletedTraversal = _traversal.getStartOfCompletedTraversal(); uint64_t startOfCompletedTraversal = _traversal.getStartOfCompletedTraversal();
if (next.element->getLastChangedContent() > startOfCompletedTraversal) { if (next.element->getLastChangedContent() > startOfCompletedTraversal) {
next.element->forEachEntity([=](EntityItemPointer entity) { next.element->forEachEntity([this](EntityItemPointer entity) {
// Bail early if we've already checked this entity this frame // Bail early if we've already checked this entity this frame
if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) { if (_entitiesInQueue.find(entity.get()) != _entitiesInQueue.end()) {
return; return;
@ -467,7 +467,7 @@ bool EntityTreeSendThread::traverseTreeAndBuildNextPacketPayload(EncodeBitstream
return true; return true;
} }
void EntityTreeSendThread::editingEntityPointer(const EntityItemPointer entity) { void EntityTreeSendThread::editingEntityPointer(const EntityItemPointer& entity) {
if (entity) { if (entity) {
if (_entitiesInQueue.find(entity.get()) == _entitiesInQueue.end() && _knownState.find(entity.get()) != _knownState.end()) { if (_entitiesInQueue.find(entity.get()) == _entitiesInQueue.end() && _knownState.find(entity.get()) != _knownState.end()) {
bool success = false; bool success = false;

2
assignment-client/src/entities/EntityTreeSendThread.h
View file

@ -59,7 +59,7 @@ private:
uint16_t _numEntities { 0 }; uint16_t _numEntities { 0 };
private slots: private slots:
void editingEntityPointer(const EntityItemPointer entity); void editingEntityPointer(const EntityItemPointer& entity);
void deletingEntityPointer(EntityItem* entity); void deletingEntityPointer(EntityItem* entity);
}; };