code optimization, cleanup.

This commit is contained in:
michal
2014-08-30 21:33:30 -04:00
parent d15ae9d578
commit 7bd44efc8e
3 changed files with 89 additions and 93 deletions

View File

@@ -52,21 +52,26 @@ protected:
private:
std::ifstream& skipToLine(std::ifstream& file, unsigned int num);
bool readSpeckFile(const std::string& path);
void generateBufferObjects(const void* data);
properties::StringProperty _colorTexturePath;
ghoul::opengl::ProgramObject* _programObject;
ghoul::opengl::ProgramObject* _programObjectPoints;
ghoul::opengl::ProgramObject* _haloProgram;
ghoul::opengl::ProgramObject* _pointProgram;
ghoul::opengl::Texture* _texture;
std::string _speckPath;
GLint vertsToDraw;
GLuint _vboID;
GLuint _vaoID;
GLint positionAttrib;
GLint brightnessDataAttrib;
int v_size;
int v_stride;
int v_total;
};
} // namespace openspace