mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug introduced in commit f484005... due to enum Chunk::Status was implicitely casted to bool. Changed enum to class

Browse Source
This commit is contained in:
Erik Broberg
2016-05-17 13:22:45 -04:00
parent a9d34d4d25
commit 974fff33fd
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/globes/chunk.cpp
+6 -5
View File
@@ -102,8 +102,9 @@ namespace openspace {
_isVisible &= HorizonCuller::isVisible(myRenderData, _surfacePatch, ellipsoid, maxHeight);
}
if(!_isVisible && owner()->mergeInvisible)
return WANT_MERGE;
if (!_isVisible && owner()->mergeInvisible) {
return Status::WANT_MERGE;
}
Vec3 cameraPosition = myRenderData.camera.position().dvec3();
@@ -125,9 +126,9 @@ namespace openspace {
// clamp level
desiredLevel = glm::clamp(desiredLevel, _owner->minSplitDepth, _owner->maxSplitDepth);
if (desiredLevel < _index.level) return WANT_MERGE;
else if (_index.level < desiredLevel) return WANT_SPLIT;
else return DO_NOTHING;
if (desiredLevel < _index.level) return Status::WANT_MERGE;
else if (_index.level < desiredLevel) return Status::WANT_SPLIT;
else return Status::DO_NOTHING;
}
void Chunk::render(const RenderData& data) const {