Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-16 22:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix layered zone applications

Browse source
This commit is contained in:
Zach Pomerantz 2016-08-30 16:58:28 -07:00
parent bb39cdafda
commit 0e9ff04c4c
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -1167,11 +1167,13 @@ void EntityTreeRenderer::LayeredZones::applyPartial(iterator layer) {
bool hasSkybox = false;
_skyboxLayer = end();
// empty
if (layer == end()) {
assert(layer == begin());
_entityTreeRenderer->applyZoneAndHasSkybox(nullptr);
return;
if (empty()) {
_entityTreeRenderer->applyZoneAndHasSkybox(nullptr);
return;
} else { // a layer was removed - reapply from beginning
layer = begin();
}
}
if (layer == begin()) {
@ -1190,5 +1192,10 @@ void EntityTreeRenderer::LayeredZones::applyPartial(iterator layer) {
}
bool EntityTreeRenderer::LayeredZones::contains(const LayeredZones& other) {
return std::equal(other.begin(), other._skyboxLayer, begin());
bool result = std::equal(other.begin(), other._skyboxLayer, begin());
if (result) {
// if valid, set the _skyboxLayer from the other LayeredZones
_skyboxLayer = std::next(begin(), std::distance(other.begin(), other._skyboxLayer));
}
return result;
}