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

Finalized the billboard rendering. Code cleanup

Browse Source
This commit is contained in:
Hans-Christian Helltegen
2014-12-01 16:27:30 +01:00
parent 337ce2dd92
commit 834612469c
5 changed files with 43 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,17 +27,9 @@
// open space includes
#include <openspace/rendering/renderable.h>
#include <openspace/util/updatestructures.h>
// ghoul includes
#include <ghoul/opengl/programobject.h>
#include <ghoul/filesystem/file.h>
namespace ghoul {
namespace opengl {
class Texture;
}
}
namespace openspace {
struct LinePoint;
@@ -60,14 +52,10 @@ private:
std::vector<glm::vec3> _seedPoints;
ghoul::opengl::ProgramObject* _shader;
GLuint _fieldlineVAO, _seedpointVAO;
GLuint _fieldlineVAO;
std::vector<GLint> _lineStart;
std::vector<GLsizei> _lineCount;
//TEST
ghoul::opengl::Texture* _texture;
void loadTexture(std::string path);
};
} // namespace openspace