Merge branch 'develop' of openspace.itn.liu.se:/openspace into feature/geometryfieldlines

include/openspace/rendering/model/renderablemodel.h

@@ -49,6 +49,8 @@ public:
     bool initialize() override;
     bool deinitialize() override;
 
+	bool isReady() const override;
+
 	void render(const RenderData& data) override;
     void update(const UpdateData& data) override;
 

include/openspace/rendering/planets/renderableplanet.h

@@ -48,6 +48,7 @@ public:
 
     bool initialize() override;
     bool deinitialize() override;
+	bool isReady() const override;
 
 	void render(const RenderData& data) override;
     void update(const UpdateData& data) override;

include/openspace/rendering/renderable.h

@@ -55,6 +55,8 @@ public:
     virtual bool initialize() = 0;
     virtual bool deinitialize() = 0;
 
+	virtual bool isReady() const = 0;
+
     void setBoundingSphere(const PowerScaledScalar& boundingSphere);
     const PowerScaledScalar& getBoundingSphere();
 

include/openspace/rendering/renderableephemeris.h

@@ -43,6 +43,8 @@ public:
 
 	bool initialize() override;
 	bool deinitialize() override;
+	
+	bool isReady() const override;
 
 	void render(const RenderData& data) override;
 	void update(const UpdateData& data) override;

include/openspace/rendering/renderablefieldlines.h

@@ -42,6 +42,8 @@ public:
 	bool initialize();
 	bool deinitialize();
 
+	bool isReady() const override;
+
 	void render(const RenderData& data) override;
 
 private:

include/openspace/rendering/renderablefov.h

@@ -44,6 +44,8 @@ public:
 	bool initialize() override;
 	bool deinitialize() override;
 
+	bool isReady() const override;
+
 	void render(const RenderData& data) override;
 	void update(const UpdateData& data) override;
  private:

include/openspace/rendering/renderablepath.h

@@ -44,6 +44,8 @@ namespace openspace {
 		bool initialize() override;
 		bool deinitialize() override;
 
+		bool isReady() const override;
+
 		void render(const RenderData& data) override;
 		void update(const UpdateData& data) override;
 	private:

include/openspace/rendering/renderableplane.h

@@ -47,8 +47,10 @@ public:
 	RenderablePlane(const ghoul::Dictionary& dictionary);
 	~RenderablePlane();
 
-	bool initialize();
-	bool deinitialize();
+	bool initialize() override;
+	bool deinitialize() override;
+
+	bool isReady() const override;
 
 	void render(const RenderData& data) override;
 	void update(const UpdateData& data) override;

include/openspace/rendering/renderablesphericalgrid.h

@@ -44,6 +44,8 @@ public:
 	bool initialize()   override;
 	bool deinitialize() override;
 
+	bool isReady() const override;
+
 	void render(const RenderData& data) override;
 	void update(const UpdateData& data) override;
 private:

include/openspace/rendering/renderabletrail.h

@@ -44,6 +44,8 @@ public:
 	bool initialize() override;
 	bool deinitialize() override;
 
+	bool isReady() const override;
+
 	void render(const RenderData& data) override;
 	void update(const UpdateData& data) override;
  private:

include/openspace/rendering/renderablevolumegl.h

@@ -46,8 +46,10 @@ public:
 	RenderableVolumeGL(const ghoul::Dictionary& dictionary);
 	~RenderableVolumeGL();
     
-	bool initialize();
-    bool deinitialize();
+	bool initialize() override;
+    bool deinitialize() override;
+
+	bool isReady() const override;
 
 	virtual void render(const RenderData& data) override;
 	virtual void update(const UpdateData& data) override;

include/openspace/rendering/stars/renderablestars.h

@@ -25,54 +25,61 @@
 #ifndef __RENDERABLESTARS_H__
 #define __RENDERABLESTARS_H__
 
-// open space includes
 #include <openspace/rendering/renderable.h>
 #include <openspace/properties/stringproperty.h>
+#include <openspace/properties/optionproperty.h>
 
-// ghoul includes
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 
+namespace openspace {
 
-namespace openspace{
-
-class RenderableStars : public Renderable{
+class RenderableStars : public Renderable {
 public: 
 	RenderableStars(const ghoul::Dictionary& dictionary);
-	~RenderableStars();
 
-	bool initialize()   override;
+	bool initialize() override;
 	bool deinitialize() override;
 
+	bool isReady() const override;
+
 	void render(const RenderData& data) override;
 	void update(const UpdateData& data) override;
 
-protected:
-	void loadTexture();
-
 private:
-	std::ifstream& skipToLine(std::ifstream& file, unsigned int num);
-	bool readSpeckFile(const std::string& path);
-	void generateBufferObjects(const void* data);
+	enum ColorOption {
+		Color = 0,
+		Velocity = 1,
+		Speed = 2
+	};
+
+	void createDataSlice(ColorOption option);
+
+	bool loadData();
+	bool readSpeckFile();
+	bool loadCachedFile(const std::string& file);
+	bool saveCachedFile(const std::string& file) const;
 
 	properties::StringProperty _colorTexturePath;
-
-	ghoul::opengl::ProgramObject* _haloProgram;
-	ghoul::opengl::ProgramObject* _pointProgram;
-
 	ghoul::opengl::Texture* _texture;
+	bool _textureIsDirty;
 
-	std::string _speckPath;
+	properties::OptionProperty _colorOption;
+	bool _dataIsDirty;
 
-	//GLint vertsToDraw;
+	properties::FloatProperty _spriteSize;
 
-	GLuint _vboID;
-	GLuint _vaoID;
-	GLint positionAttrib;
-	GLint brightnessDataAttrib;
-	int v_size;
-	int v_stride;
-	int v_total;
+	ghoul::opengl::ProgramObject* _program;
+	bool _programIsDirty;
+
+	std::string _speckFile;
+
+	std::vector<float> _slicedData;
+	std::vector<float> _fullData;
+	int _nValuesPerStar;
+
+	GLuint _vao;
+	GLuint _vbo;
 };
 
 } // namespace openspace