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

Encapsulate identifier, guiName, and description into a PropertyInfo struct

Browse Source
This commit is contained in:
Alexander Bock
2017-07-22 17:36:03 -04:00
parent b584f0197e
commit 04bac9293b
76 changed files with 422 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/rendering/layer/layer.cpp
+7 -12
View File
@@ -42,28 +42,23 @@ namespace {
Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict)
: properties::PropertyOwner(layerDict.value<std::string>(keyName))
, _typeOption(
"type",
"Type",
"", // @TODO Missing documentation
{ "type", "Type", "" }, // @TODO Missing documentation
properties::OptionProperty::DisplayType::Dropdown
)
, _blendModeOption(
"blendMode",
"Blend Mode",
"", // @TODO Missing documentation
{ "blendMode", "Blend Mode", "" }, // @TODO Missing documentation
properties::OptionProperty::DisplayType::Dropdown
)
, _enabled(properties::BoolProperty("enabled", "Enabled", "", false)) // @TODO Missing documentation
, _reset("reset", "Reset", "") // @TODO Missing documentation
, _enabled({ "enabled", "Enabled", "" }, false) // @TODO Missing documentation
, _reset({ "reset", "Reset", "" }) // @TODO Missing documentation
, _tileProvider(nullptr)
, _otherTypesProperties{
properties::Vec3Property (
"color",
"Color",
"", // @TODO Missing documentation
{ "color", "Color", "" }, // @TODO Missing documentation
glm::vec4(1.f, 1.f, 1.f, 1.f),
glm::vec4(0.f),
glm::vec4(1.f))
glm::vec4(1.f)
)
}
, _layerGroupId(id)
{
modules/globebrowsing/rendering/layer/layeradjustment.cpp
+3 -9
View File
@@ -35,25 +35,19 @@ namespace openspace::globebrowsing {
LayerAdjustment::LayerAdjustment()
: properties::PropertyOwner("adjustment")
, chromaKeyColor(
"chromaKeyColor",
"Chroma key color",
"", // @TODO Missing documentation
{ "chromaKeyColor", "Chroma key color", "" }, // @TODO Missing documentation
glm::vec3(0.f, 0.f, 0.f),
glm::vec3(0.f),
glm::vec3(1.f)
)
, chromaKeyTolerance(
"chromaKeyTolerance",
"Chroma key tolerance",
"", // @TODO Missing documentation
{ "chromaKeyTolerance", "Chroma key tolerance", "" }, // @TODO Missing documentation
0,
0,
1
)
, _typeOption(
"type",
"Type",
"", // @TODO Missing documentation
{ "type", "Type", "" }, // @TODO Missing documentation
properties::OptionProperty::DisplayType::Dropdown
)
, _onChangeCallback([](){})
modules/globebrowsing/rendering/layer/layergroup.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ namespace openspace::globebrowsing {
LayerGroup::LayerGroup(layergroupid::GroupID id)
: properties::PropertyOwner(std::move(layergroupid::LAYER_GROUP_NAMES[id]))
, _groupId(id)
, _levelBlendingEnabled("blendTileLevels", "blend tile levels", false)
, _levelBlendingEnabled({ "blendTileLevels", "blend tile levels", "" }, false) // @TODO Missing documentation
{
addProperty(_levelBlendingEnabled);
}
modules/globebrowsing/rendering/layer/layerrendersettings.cpp
+6 -6
View File
@@ -36,12 +36,12 @@ namespace openspace::globebrowsing {
LayerRenderSettings::LayerRenderSettings()
: properties::PropertyOwner("Settings")
, setDefault("setDefault", "Set Default", "") // @TODO Missing documentation
, opacity(properties::FloatProperty("opacity", "Opacity", "", 1.f, 0.f, 1.f)) // @TODO Missing documentation
, gamma(properties::FloatProperty("gamma", "Gamma", "", 1, 0, 5))// @TODO Missing documentation
, multiplier(properties::FloatProperty("multiplier", "Multiplier", "", 1.f, 0.f, 20.f))// @TODO Missing documentation
, offset(properties::FloatProperty("offset", "Offset", "", 0.f, -10000.f, 10000.f))// @TODO Missing documentation
, valueBlending(properties::FloatProperty("valueBlending", "Value Blending", "", // @TODO Missing documentation
, setDefault({ "setDefault", "Set Default", "" }) // @TODO Missing documentation
, opacity(properties::FloatProperty({ "opacity", "Opacity", "" }, 1.f, 0.f, 1.f)) // @TODO Missing documentation
, gamma(properties::FloatProperty({ "gamma", "Gamma", "" }, 1, 0, 5))// @TODO Missing documentation
, multiplier(properties::FloatProperty({ "multiplier", "Multiplier", "" }, 1.f, 0.f, 20.f))// @TODO Missing documentation
, offset(properties::FloatProperty({ "offset", "Offset", "" }, 0.f, -10000.f, 10000.f))// @TODO Missing documentation
, valueBlending(properties::FloatProperty({ "valueBlending", "Value Blending", "" }, // @TODO Missing documentation
1.f, 0.f, 1.f))
, useValueBlending(false)
{