Created classes for PlanetGeometry

Added SimpleSphereGeometry
Created infrastructure for added other geometries
This commit is contained in:
Alexander Bock
2014-05-05 17:28:46 +02:00
parent d7eb868dde
commit a86d544812
14 changed files with 423 additions and 111 deletions
@@ -27,10 +27,8 @@
// 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>
@@ -38,6 +36,10 @@
namespace openspace {
namespace planetgeometry {
class PlanetGeometry;
}
class RenderablePlanet : public Renderable {
public:
RenderablePlanet(const ghoul::Dictionary& dictionary);
@@ -53,17 +55,14 @@ public:
void update() override;
protected:
void createSphere();
void loadTexture();
private:
properties::Vec2Property _radius;
properties::IntProperty _segments;
properties::StringProperty _colorTexturePath;
ghoul::opengl::ProgramObject* _programObject;
ghoul::opengl::Texture* _texture;
PowerScaledSphere* _planet;
planetgeometry::PlanetGeometry* _geometry;
};
} // namespace openspace