mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 19:29:04 -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/globebrowsing/src/layeradjustment.cpp
+8 -5
View File
@@ -127,20 +127,23 @@ void LayerAdjustment::setValuesFromDictionary(const ghoul::Dictionary& adjustmen
"LayerAdjustment"
);
if (adjustmentDict.hasKeyAndValue<std::string>(KeyType)) {
if (adjustmentDict.hasValue<std::string>(KeyType)) {
std::string dictType = adjustmentDict.value<std::string>(KeyType);
_typeOption = static_cast<int>(
ghoul::from_string<layergroupid::AdjustmentTypeID>(dictType)
);
}
if (adjustmentDict.hasKeyAndValue<glm::vec3>(KeyChromaKeyColor)) {
glm::vec3 dictChromaKeyColor = adjustmentDict.value<glm::vec3>(KeyChromaKeyColor);
if (adjustmentDict.hasValue<glm::dvec3>(KeyChromaKeyColor)) {
glm::vec3 dictChromaKeyColor =
adjustmentDict.value<glm::dvec3>(KeyChromaKeyColor);
_chromaKeyColor = std::move(dictChromaKeyColor);
}
if (adjustmentDict.hasKeyAndValue<float>(KeyChromaKeyTolerance)) {
float dictChromaKeyTolerance = adjustmentDict.value<float>(KeyChromaKeyTolerance);
if (adjustmentDict.hasValue<double>(KeyChromaKeyTolerance)) {
float dictChromaKeyTolerance = static_cast<float>(
adjustmentDict.value<double>(KeyChromaKeyTolerance)
);
_chromaKeyTolerance = dictChromaKeyTolerance;
}
}