Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-06-05 05:51:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use [this] for lambda capture list

Browse source
This commit is contained in:
Andrew Meadows 2017-09-25 17:40:15 -07:00
parent f5f1a64c92
commit 32910e6f40
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities/src/DiffTraversal.cpp
View file

@ -167,21 +167,21 @@ DiffTraversal::Type DiffTraversal::prepareNewTraversal(const ViewFrustum& viewFr
type = Type::First; type = Type::First;
_currentView.viewFrustum = viewFrustum; _currentView.viewFrustum = viewFrustum;
_currentView.lodScaleFactor = lodScaleFactor; _currentView.lodScaleFactor = lodScaleFactor;
_getNextVisibleElementCallback = [&](DiffTraversal::VisibleElement& next) { _getNextVisibleElementCallback = [this](DiffTraversal::VisibleElement& next) {
_path.back().getNextVisibleElementFirstTime(next, _currentView); _path.back().getNextVisibleElementFirstTime(next, _currentView);
}; };
} else if (!_currentView.usesViewFrustum || } else if (!_currentView.usesViewFrustum ||
(_completedView.viewFrustum.isVerySimilar(viewFrustum) && (_completedView.viewFrustum.isVerySimilar(viewFrustum) &&
lodScaleFactor == _completedView.lodScaleFactor)) { lodScaleFactor == _completedView.lodScaleFactor)) {
type = Type::Repeat; type = Type::Repeat;
_getNextVisibleElementCallback = [&](DiffTraversal::VisibleElement& next) { _getNextVisibleElementCallback = [this](DiffTraversal::VisibleElement& next) {
_path.back().getNextVisibleElementRepeat(next, _completedView, _completedView.startTime); _path.back().getNextVisibleElementRepeat(next, _completedView, _completedView.startTime);
}; };
} else { } else {
type = Type::Differential; type = Type::Differential;
_currentView.viewFrustum = viewFrustum; _currentView.viewFrustum = viewFrustum;
_currentView.lodScaleFactor = lodScaleFactor; _currentView.lodScaleFactor = lodScaleFactor;
_getNextVisibleElementCallback = [&](DiffTraversal::VisibleElement& next) { _getNextVisibleElementCallback = [this](DiffTraversal::VisibleElement& next) {
_path.back().getNextVisibleElementDifferential(next, _currentView, _completedView); _path.back().getNextVisibleElementDifferential(next, _currentView, _completedView);
}; };
} }