mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-09 14:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow renderablefieldlines to load a passed file instead of requiring loading through Lua

Browse Source
This commit is contained in:
Alexander Bock
2015-01-20 21:32:46 +01:00
parent 4b40e88843
commit 16518dbc96
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openspace-data

Submodule openspace-data updated: 38e21a1957...dc638c66fd

42
src/rendering/renderablefieldlines.cpp
View File

@@ -28,6 +28,7 @@
#include <openspace/util/kameleonwrapper.h>
#include <openspace/util/constants.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/filesystem/file.h>
#include <ghoul/misc/assert.h>
@@ -99,7 +100,7 @@ bool RenderableFieldlines::initialize() {
return false;
}
ghoul_assert(_hintsDictionaries.size() != _filenames.size(),
ghoul_assert(_hintsDictionaries.size() == _filenames.size(),
"The dictionary sizes should match, "
<< _hintsDictionaries.size() << " != " << _filenames.size());
@@ -218,15 +219,42 @@ std::vector<std::vector<LinePoint> > RenderableFieldlines::getFieldlinesData(std
}
// ------ SEEDPOINTS ---------------
ghoul::Dictionary seedpointsDictionary;
_seedPoints.clear();
if (hintsDictionary.hasKey("Seedpoints") && hintsDictionary.getValue("Seedpoints", seedpointsDictionary)) {
glm::vec3 seedPos;
for (const std::string& index : seedpointsDictionary.keys()) {
hintsDictionary.getValue("Seedpoints."+index, seedPos);
_seedPoints.push_back(seedPos);
if (hintsDictionary.hasKey("Seedpoints")) {
if (hintsDictionary.hasKeyAndValue<ghoul::Dictionary>("Seedpoints")) {
LINFO("Loading provided list of seed points");
ghoul::Dictionary seedpointsDictionary;
hintsDictionary.getValue("Seedpoints", seedpointsDictionary);
glm::vec3 seedPos;
for (const std::string& index : seedpointsDictionary.keys()) {
hintsDictionary.getValue("Seedpoints." + index, seedPos);
_seedPoints.push_back(seedPos);
}
}
else if (hintsDictionary.hasKeyAndValue<std::string>("Seedpoints")) {
std::string seedPointsFile;
hintsDictionary.getValue("Seedpoints", seedPointsFile);
seedPointsFile = absPath(seedPointsFile);
LINFO("Reading seed points from file '" << seedPointsFile << "'");
std::ifstream seedFile(seedPointsFile);
if (!seedFile.good())
LERROR("Could not open seed points file '" << seedPointsFile << "'");
else {
std::string line;
glm::vec3 point;
while (std::getline(seedFile, line)) {
std::stringstream s(line);
s >> point.x;
s >> point.y;
s >> point.z;
_seedPoints.push_back(std::move(point));
}
}
}
}
else
LERROR("Fieldlines did not provide seed points");
// ------ CLASSIFICATION & COLOR -----------
hintsDictionary.getValue("Color", fieldlineColor);