mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06: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

19
modules/volume/transferfunction.cpp
View File

@@ -109,18 +109,15 @@ void TransferFunction::loadEnvelopesFromFile(const std::string& path) {
ghoul::Dictionary dictionary;
ghoul::lua::loadDictionaryFromFile(path, dictionary, L);
const std::vector<std::string>& tfKeys = dictionary.keys();
for (const std::string& key : tfKeys) {
for (std::string_view key : dictionary.keys()) {
ghoul::Dictionary tfDictionary = dictionary.value<ghoul::Dictionary>(key);
const std::vector<std::string>& envelopeKeys = tfDictionary.keys();
for (const std::string& envelopeKey : envelopeKeys) {
for (std::string_view envelopeKey : tfDictionary.keys()) {
ghoul::Dictionary envelopeDictionary =
tfDictionary.value<ghoul::Dictionary>(envelopeKey);
const std::vector<std::string>& pointKeys = envelopeDictionary.keys();
Envelope env;
std::vector<EnvelopePoint> tmpVec;
for (const std::string& pointKey : pointKeys) {
for (std::string_view pointKey : envelopeDictionary.keys()) {
ghoul::Dictionary pointDictionary =
envelopeDictionary.value<ghoul::Dictionary>(pointKey);
@@ -128,9 +125,13 @@ void TransferFunction::loadEnvelopesFromFile(const std::string& path) {
pointDictionary.value<ghoul::Dictionary>("position");
std::string color = pointDictionary.value<std::string>("color");
float posX = positionDictionary.value<float>("x");
float posY = positionDictionary.value<float>("y");
tmpVec.emplace_back(color, posX, posY);
double posX = positionDictionary.value<double>("x");
double posY = positionDictionary.value<double>("y");
tmpVec.emplace_back(
color,
static_cast<float>(posX),
static_cast<float>(posY)
);
}
env.setPoints(tmpVec);
_envelopes.emplace_back(env);