Merged with feature/ABuffer

This commit is contained in:
Hans-Christian Helltegen
2014-06-27 15:49:49 -04:00
54 changed files with 2550 additions and 585 deletions
@@ -32,12 +32,6 @@
#include <ghoul/opengl/programobject.h>
#include <ghoul/filesystem/file.h>
#ifdef __APPLE__
#include <memory>
#else
#include <mutex>
#endif
namespace openspace {
class RenderableFieldlines : public Renderable {
@@ -61,8 +55,6 @@ private:
ghoul::opengl::ProgramObject *_fieldlinesProgram;
GLuint _VAO, _seedpointVAO;
std::mutex* _shaderMutex;
ghoul::filesystem::File* _vertexSourceFile;
ghoul::filesystem::File* _fragmentSourceFile;
@@ -70,6 +62,7 @@ private:
std::vector<GLsizei> _lineCount;
bool _programUpdateOnSave;
bool _update;
void safeShaderCompilation();
};