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

More code cleanup of RenderableFieldlines

Browse Source
This commit is contained in:
Alexander Bock
2015-01-21 15:13:16 +01:00
parent f752221772
commit 8ebd2e4d71
3 changed files with 194 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/openspace/rendering/renderablefieldlines.h
View File

@@ -57,12 +57,18 @@ public:
void update(const UpdateData& data) override;
private:
typedef std::vector<LinePoint> Line;
void initializeDefaultPropertyValues();
//std::vector<std::vector<LinePoint> > getFieldlinesData(std::string filename, ghoul::Dictionary hintsDictionary);
std::vector<std::vector<LinePoint>> getFieldlinesData();
std::vector<Line> getFieldlinesData();
void loadSeedPoints();
void loadSeedPointsFromFile();
void loadSeedPointsFromTable();
std::vector<Line> generateFieldlines();
std::vector<Line> generateFieldlinesVolumeKameleon();
properties::FloatProperty _stepSize;
properties::BoolProperty _classification;
properties::Vec4Property _fieldlineColor;
@@ -76,6 +82,9 @@ private:
ghoul::Dictionary _fieldlineInfo;
ghoul::Dictionary _seedPointsInfo;
bool _seedPointsAreDirty;
bool _fieldLinesAreDirty;
std::vector<glm::vec3> _seedPoints;
GLuint _fieldlineVAO;