Merge remote-tracking branch 'origin/feature/milkyway' into develop

include/openspace/rendering/planets/simplespheregeometry.h

@@ -52,7 +52,7 @@ private:
     properties::Vec2Property _radius;
     properties::IntProperty _segments;
 
-    PowerScaledSphere* _planet;
+    PowerScaledSphere* _sphere;
 };
 
 }  // namespace planetgeometry

include/openspace/rendering/renderablesphere.h

@@ -0,0 +1,75 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014                                                                    *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __RENDERABLESPHERE_H__
+#define __RENDERABLESPHERE_H__
+
+#include <openspace/rendering/renderable.h>
+#include <openspace/util/updatestructures.h>
+
+#include <openspace/properties/stringproperty.h>
+#include <openspace/properties/optionproperty.h>
+#include <openspace/properties/vectorproperty.h>
+#include <ghoul/opengl/programobject.h>
+#include <ghoul/opengl/texture.h>
+
+namespace openspace {
+
+class PowerScaledSphere;
+
+class RenderableSphere : public Renderable {
+public:
+	RenderableSphere(const ghoul::Dictionary& dictionary);
+	~RenderableSphere();
+
+	bool initialize() override;
+	bool deinitialize() override;
+
+	bool isReady() const override;
+
+	void render(const RenderData& data) override;
+	void update(const UpdateData& data) override;
+
+private:
+	void loadTexture();
+
+	properties::StringProperty _texturePath;
+    properties::OptionProperty _orientation;
+
+    properties::Vec2Property _size;
+    properties::IntProperty _segments;
+
+    properties::FloatProperty _transparency;
+
+	ghoul::opengl::ProgramObject* _shader;
+	ghoul::opengl::Texture* _texture;
+
+    PowerScaledSphere* _sphere;
+
+    bool _programIsDirty;
+    bool _sphereIsDirty;
+};
+
+} // namespace openspace
+#endif // __RENDERABLESPHERE_H__