mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 13:08:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

More property work

Browse Source 
Add StringProperty
Add possibility for callbacks
Switch RenderablePlanet to use Properties
This commit is contained in:
Alexander Bock
2014-05-03 19:53:12 +02:00
parent 8d2e86447c
commit ac38f73faa
10 changed files with 246 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/renderable.h
+1
View File
@@ -51,6 +51,7 @@ public:
virtual void render(const Camera *camera, const psc &thisPosition) = 0;
virtual void update();
protected:
//Renderable();
private:
include/openspace/rendering/renderableplanet.h
+23 -18
View File
@@ -28,41 +28,46 @@
// open space includes
#include <openspace/rendering/renderable.h>
#include <openspace/util/powerscaledsphere.h>
#include <openspace/properties/scalarproperty.h>
#include <openspace/properties/stringproperty.h>
#include <openspace/properties/vectorproperty.h>
// ghoul includes
#include <ghoul/opengl/programobject.h>
#include <ghoul/opengl/texture.h>
namespace openspace {
class RenderablePlanet: public Renderable {
class RenderablePlanet : public Renderable {
public:
// constructors & destructor
RenderablePlanet(const ghoul::Dictionary& dictionary);
~RenderablePlanet();
// constructors & destructor
RenderablePlanet(const ghoul::Dictionary& dictionary);
~RenderablePlanet();
bool initialize() override;
bool deinitialize() override;
bool initialize();
bool deinitialize();
void setProgramObject(ghoul::opengl::ProgramObject* programObject = nullptr);
void setTexture(ghoul::opengl::Texture* texture);
void setProgramObject(ghoul::opengl::ProgramObject *programObject = nullptr);
void setTexture(ghoul::opengl::Texture *texture);
void render(const Camera* camera, const psc& thisPosition) override;
void update() override;
virtual void render(const Camera *camera, const psc &thisPosition);
virtual void update();
protected:
void createSphere();
void loadTexture();
private:
// shader
properties::Vec2Property _radius;
properties::IntProperty _segments;
properties::StringProperty _colorTexturePath;
ghoul::opengl::ProgramObject* _programObject;
// texture
std::string _texturePath;
ghoul::opengl::Texture* _texture;
// Object
PowerScaledSphere* _planet;
};
} // namespace openspace
} // namespace openspace
#endif // __RENDERABLEPLANET_H__
#endif // __RENDERABLEPLANET_H__