mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-21 20:39:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Enable disabling rendering of RenderableGlobe

Browse Source
This commit is contained in:
Erik Broberg
2016-07-21 17:13:55 -04:00
parent e081cae980
commit dd01953f7c
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
modules/globebrowsing/globes/renderableglobe.cpp
View File

@@ -58,7 +58,8 @@ namespace openspace {
RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
: _saveOrThrowCamera(properties::BoolProperty("saveOrThrowCamera", "saveOrThrowCamera"))
: _isEnabled(properties::BoolProperty(" Enabled", " Enabled", true))
, _saveOrThrowCamera(properties::BoolProperty("saveOrThrowCamera", "saveOrThrowCamera"))
, _resetTileProviders(properties::BoolProperty("resetTileProviders", "resetTileProviders"))
, _cameraMinHeight(properties::FloatProperty("cameraMinHeight", "cameraMinHeight", 100.0f, 0.0f, 1000.0f))
, lodScaleFactor(properties::FloatProperty("lodScaleFactor", "lodScaleFactor", 5.0f, 1.0f, 50.0f))
@@ -98,6 +99,9 @@ namespace openspace {
_ellipsoid, patchSegments, _tileProviderManager);
_distanceSwitch.addSwitchValue(_chunkedLodGlobe, 1e12);
addProperty(_isEnabled);
// Add debug options - must be after chunkedLodGlobe has been created as it
// references its members
addProperty(debugSelection);
@@ -157,20 +161,21 @@ namespace openspace {
}
void RenderableGlobe::render(const RenderData& data) {
if (_saveOrThrowCamera.value()) {
_saveOrThrowCamera.setValue(false);
if (_isEnabled.value()) {
if (_saveOrThrowCamera.value()) {
_saveOrThrowCamera.setValue(false);
if (_chunkedLodGlobe->getSavedCamera() == nullptr) { // save camera
LDEBUG("Saving snapshot of camera!");
_chunkedLodGlobe->setSaveCamera(std::make_shared<Camera>(data.camera));
}
else { // throw camera
LDEBUG("Throwing away saved camera!");
_chunkedLodGlobe->setSaveCamera(nullptr);
if (_chunkedLodGlobe->getSavedCamera() == nullptr) { // save camera
LDEBUG("Saving snapshot of camera!");
_chunkedLodGlobe->setSaveCamera(std::make_shared<Camera>(data.camera));
}
else { // throw camera
LDEBUG("Throwing away saved camera!");
_chunkedLodGlobe->setSaveCamera(nullptr);
}
}
_distanceSwitch.render(data);
}
_distanceSwitch.render(data);
}
void RenderableGlobe::update(const UpdateData& data) {

2
modules/globebrowsing/globes/renderableglobe.h
View File

@@ -120,6 +120,7 @@ public:
// Properties
properties::BoolProperty _isEnabled;
properties::FloatProperty lodScaleFactor;
std::vector<std::unique_ptr<ReferencedBoolSelection>> _categorySelections;
properties::BoolProperty atmosphereEnabled;
@@ -127,6 +128,7 @@ public:
properties::BoolProperty _saveOrThrowCamera;
properties::BoolProperty _resetTileProviders;
private: