mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 02:48:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Introduction of new Dictionary class (#1446)

Browse Source 
* Adapting to introduction of new Dictionary class in Ghoul
 * Mainly replacing usage of float instead of doubles as expected
 * Adjust to the lack of the hasKeyAndValue function
This commit is contained in:
Alexander Bock
2021-01-02 15:07:11 +01:00
committed by GitHub
parent 7bf7a25401
commit 067c0f4b27
121 changed files with 2299 additions and 2160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/digitaluniverse/rendering/renderableplanescloud.cpp
+11 -7
View File
@@ -276,7 +276,7 @@ documentation::Documentation RenderablePlanesCloud::Documentation() {
},
{
FadeInDistancesInfo.identifier,
new Vector2Verifier<float>,
new DoubleVector2Verifier,
Optional::Yes,
FadeInDistancesInfo.description
},
@@ -385,7 +385,7 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
_hasLabel = true;
if (dictionary.hasKey(TextColorInfo.identifier)) {
_textColor = dictionary.value<glm::vec3>(TextColorInfo.identifier);
_textColor = dictionary.value<glm::dvec3>(TextColorInfo.identifier);
_hasLabel = true;
}
_textColor.setViewOption(properties::Property::ViewOptions::Color);
@@ -393,24 +393,28 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
_textColor.onChange([&]() { _textColorIsDirty = true; });
if (dictionary.hasKey(TextOpacityInfo.identifier)) {
_textOpacity = dictionary.value<float>(TextOpacityInfo.identifier);
_textOpacity = static_cast<float>(
dictionary.value<double>(TextOpacityInfo.identifier)
);
}
addProperty(_textOpacity);
if (dictionary.hasKey(TextSizeInfo.identifier)) {
_textSize = dictionary.value<float>(TextSizeInfo.identifier);
_textSize = static_cast<float>(
dictionary.value<double>(TextSizeInfo.identifier)
);
}
addProperty(_textSize);
if (dictionary.hasKey(LabelMinSizeInfo.identifier)) {
_textMinSize = static_cast<int>(
dictionary.value<float>(LabelMinSizeInfo.identifier)
dictionary.value<double>(LabelMinSizeInfo.identifier)
);
}
if (dictionary.hasKey(LabelMaxSizeInfo.identifier)) {
_textMaxSize = static_cast<int>(
dictionary.value<float>(LabelMaxSizeInfo.identifier)
dictionary.value<double>(LabelMaxSizeInfo.identifier)
);
}
}
@@ -461,7 +465,7 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
}
if (dictionary.hasKey(FadeInDistancesInfo.identifier)) {
_fadeInDistance = dictionary.value<glm::vec2>(FadeInDistancesInfo.identifier);
_fadeInDistance = dictionary.value<glm::dvec2>(FadeInDistancesInfo.identifier);
_disableFadeInDistance = false;
addProperty(_fadeInDistance);
addProperty(_disableFadeInDistance);