mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 13:08:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed depth, position, scale and shader issues with fieldlines. Added passthrough geometry shader

Browse Source
This commit is contained in:
Hans-Christian Helltegen
2014-11-21 10:37:01 +01:00
parent 1e5c181cee
commit 815fc3b348
7 changed files with 225 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/renderablefieldlines.h
+2 -10
View File
@@ -45,7 +45,6 @@ public:
bool deinitialize();
void render(const RenderData& data) override;
void update(const UpdateData& data) override;
private:
std::vector<std::vector<LinePoint> > getFieldlinesData(std::string filename, ghoul::Dictionary hintsDictionary);
@@ -54,18 +53,11 @@ private:
std::vector<std::string> _filenames;
std::vector<glm::vec3> _seedPoints;
ghoul::opengl::ProgramObject *_fieldlinesProgram;
GLuint _VAO, _seedpointVAO;
ghoul::filesystem::File* _vertexSourceFile;
ghoul::filesystem::File* _fragmentSourceFile;
ghoul::opengl::ProgramObject* _shader;
GLuint _fieldlineVAO, _seedpointVAO;
std::vector<GLint> _lineStart;
std::vector<GLsizei> _lineCount;
bool _programUpdateOnSave;
bool _update;
void safeShaderCompilation();
};
} // namespace openspace