mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

More cleanup of RenderableStars, enable rendering of Speed variable

Browse Source
This commit is contained in:
Alexander Bock
2014-11-28 15:57:14 +01:00
parent 4de8071efe
commit 20c96f00e8
5 changed files with 165 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/openspace/rendering/stars/renderablestars.h
View File

@@ -37,7 +37,6 @@ namespace openspace {
class RenderableStars : public Renderable {
public:
RenderableStars(const ghoul::Dictionary& dictionary);
~RenderableStars();
bool initialize() override;
bool deinitialize() override;
@@ -50,7 +49,8 @@ public:
private:
enum ColorOption {
Color = 0,
Velocity = 1
Velocity = 1,
Speed = 2
};
void createDataSlice(ColorOption option);
@@ -60,28 +60,26 @@ private:
bool loadCachedFile(const std::string& file);
bool saveCachedFile(const std::string& file) const;
void generateBufferObjects(const void* data);
properties::StringProperty _colorTexturePath;
ghoul::opengl::Texture* _texture;
bool _textureIsDirty;
properties::OptionProperty _colorOption;
bool _dataIsDirty;
ghoul::opengl::ProgramObject* _haloProgram;
properties::FloatProperty _spriteSize;
ghoul::opengl::ProgramObject* _program;
bool _programIsDirty;
ghoul::opengl::Texture* _texture;
std::string _speckPath;
std::string _speckFile;
std::vector<float> _slicedData;
std::vector<float> _fullData;
int _nValuesPerStar;
GLuint _vboID;
GLuint _vaoID;
GLuint _vao;
GLuint _vbo;
};
} // namespace openspace