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

Conflicts:
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablecrawlingline.cpp
	src/rendering/renderableplaneprojection.cpp

include/openspace/engine/openspaceengine.h

@@ -117,7 +117,6 @@ private:
 	ghoul::cmdparser::CommandlineParser* _commandlineParser;
 	LuaConsole* _console;
     gui::GUI* _gui;
-	double _dt;
 	bool _isMaster;
 
 	SyncBuffer* _syncBuffer;

include/openspace/interaction/controller.h

@@ -40,7 +40,7 @@ public:
 	Controller() :
 		_handler(nullptr)
 	{}
-
+    
 	void setHandler(InteractionHandler* handler);
 
 protected:

include/openspace/interaction/keyboardcontroller.h

@@ -34,6 +34,7 @@ namespace interaction {
 
 class KeyboardController : public Controller {
 public:
+    virtual ~KeyboardController() {};
 	virtual void keyPressed(KeyAction action, Key key, KeyModifier modifier) = 0;
 };
 

include/openspace/interaction/mousecontroller.h

@@ -37,6 +37,7 @@ namespace interaction {
 class MouseController : public Controller {
 public:
 	MouseController();
+    virtual ~MouseController() {}
 
 	virtual void button(MouseAction action, MouseButton button) = 0;
 	virtual void move(float x, float y) = 0;

include/openspace/rendering/planets/renderableplanetprojection.h

@@ -77,7 +77,7 @@ protected:
 
 	void textureBind();
 	void project();
-
+	void clearAllProjections();
 private:
 	void imageProjectGPU();
 
@@ -88,6 +88,8 @@ private:
 	properties::IntProperty _rotation;
 	properties::FloatProperty _fadeProjection;
 	properties::BoolProperty _performProjection;
+	properties::BoolProperty _clearAllProjections;
+
 
     ghoul::opengl::ProgramObject* _programObject;
 	ghoul::opengl::ProgramObject* _fboProgramObject;
@@ -136,6 +138,7 @@ private:
 	std::string _target;
 	std::string _frame;
 	std::string _defaultProjImage;
+	std::string _clearingImage;
 	std::string _next;
 
 	bool _capture;

include/openspace/rendering/renderabletrail.h

@@ -87,7 +87,6 @@ private:
 
     float _increment;
     double _oldTime = 0.0;
-	float _time;
 	float _distanceFade;
 };
 

include/openspace/util/spicemanager.h

@@ -85,7 +85,7 @@ public:
 	* \param filePath The path to the kernel that should be examined
 	* \return true if the operation was successful
 	*/
-	bool findCkCoverage(std::string& path);
+	bool findCkCoverage(const std::string& path);
 
 	/**
 	* Function to find and store the intervals covered by a spk file, this is done
@@ -95,7 +95,7 @@ public:
 	* \param filePath The path to the kernel that should be examined
 	* \return true if the operation was successful
 	*/
-	bool findSpkCoverage(std::string& path);
+	bool findSpkCoverage(const std::string& path);
 	
 	/**
 	 * \return true if SPK kernels have been loaded to cover <code>target</code>

include/openspace/util/time.h

@@ -188,10 +188,7 @@ private:
     Time& operator=(const Time& rhs) = delete;
 
 	static Time* _instance; ///< The singleton instance
-	
-
-	double _deltaTimePerSecond; ///< The delta time that is used to advance the time
-	
+		
 	//sync variables
 	
 	//local copies