More property work

Add StringProperty
Add possibility for callbacks
Switch RenderablePlanet to use Properties

include/openspace/properties/property.h

@@ -29,11 +29,14 @@
 
 #include <ghoul/misc/dictionary.h>
 #include <boost/any.hpp>
+#include <functional>
 #include <string>
 
 namespace openspace {
 namespace properties {
 
+class PropertyOwner;
+
 class Property {
 public:
     Property(std::string identifier, std::string guiName);
@@ -46,9 +49,14 @@ public:
     virtual void set(boost::any value);
     virtual const std::type_info& type() const;
 
+    virtual void onChange(std::function<void()> callback);
+
     const std::string& identifier() const;
     const std::string& guiName() const;
 
+    PropertyOwner* owner() const;
+    void setPropertyOwner(PropertyOwner* owner);
+
     void setGroupIdentifier(std::string groupId);
     std::string groupIdentifier() const;
 
@@ -62,16 +70,22 @@ public:
     bool viewOption(const std::string& option) const;
 
     struct ViewOptions {
-        static const std::string LightPosition;
         static const std::string Color;
+        static const std::string LightPosition;
+        static const std::string PowerScaledScalar;
+        static const std::string PowerScaledCoordinate;
     };
 
     const ghoul::Dictionary& metaData() const;
 
 protected:
+    PropertyOwner* _owner;
+
     std::string _identifier;
     std::string _guiName;
     ghoul::Dictionary _metaData;
+
+    std::vector<std::function<void()>> _onChangeCallbacks;
 };
 
 } // namespace properties

include/openspace/properties/stringproperty.h

@@ -0,0 +1,54 @@
+/*****************************************************************************************
+*                                                                                       *
+* 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 __STRINGPROPERTY_H__
+#define __STRINGPROPERTY_H__
+
+#include <openspace/properties/templateproperty.h>
+
+namespace openspace {
+namespace properties {
+
+class StringProperty : public TemplateProperty<std::string> {
+public:
+    StringProperty(std::string identifier, std::string guiName);
+    StringProperty(std::string identifier, std::string guiName, std::string value);
+
+    using TemplateProperty<std::string>::operator=;
+};
+
+template <>
+std::string PropertyDelegate<TemplateProperty<std::string>>::className();
+
+template <>
+template <>
+std::string PropertyDelegate<TemplateProperty<std::string>>::defaultValue<std::string>();
+
+//REGISTER_TEMPLATEPROPERTY_HEADER(StringProperty, std::string);
+
+
+} // namespace properties
+} // namespace openspace
+
+#endif // __STRINGPROPERTY_H__

include/openspace/properties/templateproperty.h

@@ -44,6 +44,9 @@ public:
     operator T();
     TemplateProperty<T>& operator=(T val);
 
+    void setValue(T val);
+    T value() const;
+
 protected:
     T _value;
 };

include/openspace/properties/templateproperty.inl

@@ -75,10 +75,23 @@ TemplateProperty<T>::operator T() {
 
 template <typename T>
 TemplateProperty<T>& TemplateProperty<T>::operator=(T val) {
-    _value = val;
+    setValue(val);
     return *this;
 }
 
+template <typename T>
+T openspace::properties::TemplateProperty<T>::value() const
+{
+    return _value;
+}
+
+template <typename T>
+void openspace::properties::TemplateProperty<T>::setValue(T val)
+{
+    _value = val;
+}
+
+
 template <typename T>
 boost::any TemplateProperty<T>::get() const {
     return boost::any(_value);

include/openspace/rendering/renderable.h

@@ -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

@@ -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__