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

More RenderableFieldlines code cleanup

Browse Source
This commit is contained in:
Alexander Bock
2015-01-21 01:44:56 +01:00
parent 1a66df3336
commit d6a02140ea
2 changed files with 148 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,8 @@
#include <openspace/properties/optionproperty.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/scalarproperty.h>
#include <openspace/properties/vectorproperty.h>
#include <ghoul/misc/dictionary.h>
#include <ghoul/opengl/ghoul_gl.h>
@@ -55,17 +57,24 @@ public:
void update(const UpdateData& data) override;
private:
void initializeDefaultPropertyValues();
//std::vector<std::vector<LinePoint> > getFieldlinesData(std::string filename, ghoul::Dictionary hintsDictionary);
std::vector<std::vector<LinePoint>> getFieldlinesData();
void loadSeedPointsFromFile();
void loadSeedPointsFromTable();
properties::FloatProperty _stepSize;
properties::BoolProperty _classification;
properties::Vec4Property _fieldlineColor;
properties::OptionProperty _seedPointSource;
properties::StringProperty _seedPointSourceFile;
ghoul::opengl::ProgramObject* _program;
bool _programIsDirty;
ghoul::Dictionary _vectorFieldInformation;
ghoul::Dictionary _seedPointInformation;
ghoul::Dictionary _vectorFieldInfo;
ghoul::Dictionary _fieldlineInfo;
ghoul::Dictionary _seedPointsInfo;
std::vector<glm::vec3> _seedPoints;