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

Simplify the ability to add more per layer settings and move layered rendering src files to separate folder.

Browse Source
This commit is contained in:
kalbl
2016-10-15 03:04:09 +02:00
parent ba8066c3ed
commit 2f13b9e9f4
14 changed files with 351 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/globes/renderableglobe.cpp
+6 -22
View File
@@ -59,15 +59,9 @@ namespace {
namespace openspace {
SingleTexturePropertyOwner::SingleTexturePropertyOwner(std::string name)
: isEnabled("isEnabled", "isEnabled", true)
, opacity("opacity", "opacity", 1, 0, 1)
, gamma("gamma", "gamma", 1, 0, 5)
, multiplier("multiplier", "multiplier", 1, 0, 20) {
: isEnabled("isEnabled", "isEnabled", true) {
setName(name);
addProperty(isEnabled);
addProperty(opacity);
addProperty(gamma);
addProperty(multiplier);
}
SingleTexturePropertyOwner::~SingleTexturePropertyOwner() {
@@ -96,21 +90,11 @@ namespace openspace {
prop.isEnabled.onChange([&]{
tileProvider.isActive = prop.isEnabled;
});
prop.opacity.set(tileProvider.settings.opacity);
prop.opacity.onChange([&]{
tileProvider.settings.opacity = prop.opacity;
});
prop.gamma.set(tileProvider.settings.gamma);
prop.gamma.onChange([&]{
tileProvider.settings.gamma = prop.gamma;
});
prop.multiplier.set(tileProvider.settings.multiplier);
prop.multiplier.onChange([&]{
tileProvider.settings.multiplier = prop.multiplier;
});
for (auto setting : tileProvider.settings.array) {
prop.addProperty(setting->property());
}
addPropertySubOwner(prop);
}