More cleanup

include/openspace/interaction/interactionhandler.h

@@ -25,21 +25,23 @@
 #ifndef INTERACTIONHANDLER_H
 #define INTERACTIONHANDLER_H
 
-// open space includes
-#include <openspace/util/camera.h>
-#include <openspace/interaction/externalcontrol/externalcontrol.h>
-#include <openspace/scenegraph/scenegraphnode.h>
+#include <openspace/scripting/scriptengine.h>
+#include <openspace/util/powerscaledcoordinate.h>
+#include <openspace/util/powerscaledscalar.h>
 
 // std includes
 #include <vector>
-#include <thread>
 #include <mutex>
-#include <memory>
 #include <map>
 #include <functional>
 
 namespace openspace {
 
+// Forward declare to minimize dependencies
+class Camera;
+class SceneGraphNode;
+class ExternalControl;
+
 class InteractionHandler {
 public:
     InteractionHandler(void);
@@ -47,11 +49,6 @@ public:
     InteractionHandler& operator=(const InteractionHandler& rhs);
 	virtual ~InteractionHandler();
 
-	//static void init();
-	//static void deinit();
- //   static InteractionHandler& ref();
-	//static bool isInitialized();
-
 	void enable();
 	void disable();
 	const bool isEnabled() const;
@@ -62,7 +59,7 @@ public:
 	void setCamera(Camera *camera = nullptr);
 	void setOrigin(SceneGraphNode* node);
 
-	Camera * getCamera() const;
+	Camera* getCamera() const;
 	const psc getOrigin() const;
 	void lockControls();
 	void unlockControls();
@@ -90,7 +87,7 @@ public:
 	/**
 	* Returns the Lua library that contains all Lua functions available to affect the
 	* interaction. The functions contained are
-	* - openspace::luascriptfunctions::printScreen
+	* - openspace::luascriptfunctions::setOrigin
 	* \return The Lua library that contains all Lua functions available to affect the
 	* interaction
 	*/
@@ -107,7 +104,6 @@ private:
 	
 	double dt_;
 
-
 	glm::vec3 _lastTrackballPos;
 	bool _leftMouseButtonDown, _isMouseBeingPressedAndHeld;
 

include/openspace/rendering/renderable.h

@@ -25,16 +25,17 @@
 #ifndef __RENDERABLE_H__
 #define __RENDERABLE_H__
 
+// openspace
 #include <openspace/properties/propertyowner.h>
-
 #include <openspace/properties/scalarproperty.h>
 #include <openspace/util/powerscaledcoordinate.h>
 #include <openspace/util/powerscaledscalar.h>
 #include <openspace/util/camera.h>
+#include <openspace/util/updatestructures.h>
+
+// ghoul
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/opengl/programobject.h>
-#include <openspace/properties/propertyowner.h>
-#include <openspace/util/updatestructures.h>
 
 namespace openspace {
 

include/openspace/rendering/renderengine.h

@@ -26,8 +26,6 @@
 #define __RENDERENGINE_H__
 
 #include <openspace/scripting/scriptengine.h>
-
-#include <memory>
 #include <string>
 
 namespace openspace {

include/openspace/util/factorymanager.h

@@ -27,7 +27,6 @@
 
 // ghoul includes
 #include <ghoul/misc/templatefactory.h>
-#include <ghoul/logging/logmanager.h>
 
 namespace openspace {