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

Conflicts:
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/luaconsole.cpp
	src/rendering/renderengine.cpp

include/openspace/engine/openspaceengine.h

@@ -25,19 +25,26 @@
 #ifndef __OPENSPACEENGINE_H__
 #define __OPENSPACEENGINE_H__
 
-#include <openspace/interaction/interactionhandler.h>
-#include <openspace/interaction/luaconsole.h>
-#include <openspace/rendering/renderengine.h>
-#include <openspace/engine/configurationmanager.h>
-#include <openspace/gui/gui.h>
-#include <ghoul/cmdparser/commandlineparser.h>
+#include <string>
+#include <vector>
+
+namespace ghoul {
+namespace cmdparser {
+    class CommandlineParser;
+}
+}
 
 namespace openspace {
 
-class GUI;
-class SyncBuffer;
+class ConfigurationManager;
 class LuaConsole;
+class GUI;
+class RenderEngine;
+class SyncBuffer;
 
+namespace interaction {
+    class InteractionHandler;
+}
 namespace scripting {
 	class ScriptEngine;
 }
@@ -53,13 +60,14 @@ public:
 
     static bool findConfiguration(std::string& filename);
 
-    ConfigurationManager& configurationManager();
-    interaction::InteractionHandler& interactionHandler();
-    RenderEngine& renderEngine();
-	scripting::ScriptEngine& scriptEngine();
-	LuaConsole& console();
+    // Guaranteed to return a valid pointer
+    ConfigurationManager* configurationManager();
+    interaction::InteractionHandler* interactionHandler();
+    RenderEngine* renderEngine();
+	scripting::ScriptEngine* scriptEngine();
+	LuaConsole* console();
 
-	GUI& gui();
+	GUI* gui();
 
     // SGCT callbacks
     bool initializeGL();
@@ -91,13 +99,13 @@ private:
 
     static OpenSpaceEngine* _engine;
 
-    ConfigurationManager _configurationManager;
-    interaction::InteractionHandler _interactionHandler;
-    RenderEngine _renderEngine;
-	scripting::ScriptEngine _scriptEngine;
-	ghoul::cmdparser::CommandlineParser _commandlineParser;
-	LuaConsole _console;
-	GUI _gui;
+    ConfigurationManager* _configurationManager;
+    interaction::InteractionHandler* _interactionHandler;
+    RenderEngine* _renderEngine;
+	scripting::ScriptEngine* _scriptEngine;
+	ghoul::cmdparser::CommandlineParser* _commandlineParser;
+	LuaConsole* _console;
+	GUI* _gui;
 	double _dt;
 
 	SyncBuffer* _syncBuffer;

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/renderable.h

@@ -25,15 +25,16 @@
 #ifndef __RENDERABLE_H__
 #define __RENDERABLE_H__
 
-// openspace
 #include <openspace/properties/propertyowner.h>
 #include <openspace/properties/scalarproperty.h>
 #include <openspace/util/powerscaledscalar.h>
+#include <openspace/util/updatestructures.h>
+
+#include <ghoul/opengl/programobject.h>
 
 // Forward declare to minimize dependencies
 namespace ghoul {
 	namespace opengl {
-		class ProgramObject;
 		class Texture;
 	}
 	class Dictionary;

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__

include/openspace/rendering/stars/renderablestars.h

@@ -28,6 +28,7 @@
 #include <openspace/rendering/renderable.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>
@@ -69,12 +70,13 @@ private:
 	ghoul::opengl::Texture* _colorTexture;
 	bool _colorTextureIsDirty;
 
-
 	properties::OptionProperty _colorOption;
 	bool _dataIsDirty;
 
-	properties::FloatProperty _spriteBaseSize;
-	properties::FloatProperty _spriteResponseSize;
+    properties::Vec2Property _magnitudeClamp;
+    properties::FloatProperty _exponentialOffset;
+    properties::FloatProperty _exponentialDampening;
+    properties::FloatProperty _scaleFactor;
 
 	ghoul::opengl::ProgramObject* _program;
 	bool _programIsDirty;