More include file cleanup

include/openspace/network/parallelconnection.h

@@ -30,6 +30,7 @@
 #include <openspace/properties/propertyowner.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/numericalproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
 
 //glm includes
 #include <glm/gtx/quaternion.hpp>

include/openspace/rendering/renderable.h

@@ -29,15 +29,13 @@
 
 #include <openspace/properties/scalar/boolproperty.h>
 
-#include <ghoul/opengl/programobject.h>
-
-// Forward declare to minimize dependencies
 namespace ghoul {
     namespace opengl {
+        class ProgramObject;
         class Texture;
     }
     class Dictionary;
-}
+} // namespace ghoul
 
 namespace openspace {
 

include/openspace/rendering/renderengine.h

@@ -25,20 +25,13 @@
 #ifndef __OPENSPACE_CORE___RENDERENGINE___H__
 #define __OPENSPACE_CORE___RENDERENGINE___H__
 
-#include <openspace/performance/performancemanager.h>
-#include <openspace/properties/optionproperty.h>
 #include <openspace/properties/propertyowner.h>
+
+#include <openspace/properties/optionproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/triggerproperty.h>
 
-#include <openspace/rendering/raycastermanager.h>
-#include <openspace/rendering/renderer.h>
-#include <openspace/rendering/screenspacerenderable.h>
-
-#include <openspace/scripting/scriptengine.h>
-
-#include <openspace/util/syncdata.h>
 
 namespace ghoul {
 namespace fontrendering {
@@ -49,17 +42,21 @@ namespace opengl {
 }
 class Dictionary;
 class SharedMemory;
-}
+} // namespace ghoul
 
 namespace openspace {
 
-// Forward declare to minimize dependencies
+namespace performance { class PerformanceManager; }
+namespace scripting { struct LuaLibrary; }
 class Camera;
-class SyncBuffer;
+class RaycasterManager;
+class Renderer;
 class Scene;
 class SceneManager;
 class ScreenLog;
 class ScreenSpaceRenderable;
+class Syncable;
+class SyncBuffer;
 
 class RenderEngine : public properties::PropertyOwner {
 public:

include/openspace/scene/scenegraphnode.h

@@ -25,16 +25,12 @@
 #ifndef __OPENSPACE_CORE___SCENEGRAPHNODE___H__
 #define __OPENSPACE_CORE___SCENEGRAPHNODE___H__
 
-#include <openspace/rendering/renderable.h>
-#include <openspace/scene/translation.h>
-#include <openspace/scene/rotation.h>
-#include <openspace/scene/scale.h>
 #include <openspace/properties/propertyowner.h>
 
-#include <openspace/scene/scene.h>
-#include <openspace/util/updatestructures.h>
+#include <ghoul/glm.h>
+#include <ghoul/misc/boolean.h>
 
-#include <iostream>
+#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
@@ -43,6 +39,16 @@ namespace ghoul { class Dictionary; }
 
 namespace openspace {
 
+class Camera;
+struct RenderData;
+class Renderable;
+struct RendererTasks;
+class Rotation;
+class Translation;
+class Scale;
+class Scene;
+struct UpdateData;
+
 namespace documentation { struct Documentation; }
 
 class SceneGraphNode : public properties::PropertyOwner {

modules/base/rendering/renderablemodel.cpp

@@ -33,6 +33,7 @@
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/util/time.h>
 #include <openspace/util/updatestructures.h>
+#include <openspace/scene/scene.h>
 
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/io/texture/texturereader.h>

modules/base/rendering/renderableplane.h

@@ -31,6 +31,8 @@
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 
+#include <ghoul/opengl/ghoul_gl.h>
+
 namespace ghoul {
 namespace filesystem { class File; }
 

modules/base/rendering/renderabletrail.cpp

@@ -31,6 +31,8 @@
 #include <openspace/scene/translation.h>
 #include <openspace/util/updatestructures.h>
 
+#include <ghoul/opengl/programobject.h>
+
 namespace {
     const char* KeyTranslation = "Translation";
     const char* KeyColor = "Color";

modules/base/rendering/renderabletrail.h

@@ -73,6 +73,8 @@ class Translation;
  */
 class RenderableTrail : public Renderable {
 public:
+    ~RenderableTrail() = default;
+
     bool initialize() override;
     bool deinitialize() override;
 

modules/base/rendering/renderabletrailorbit.cpp

@@ -29,6 +29,8 @@
 #include <openspace/scene/translation.h>
 #include <openspace/util/updatestructures.h>
 
+#include <ghoul/opengl/programobject.h>
+
 #include <numeric>
 
 // This class is using a VBO ring buffer + a constantly updated point as follows:

modules/base/rendering/renderabletrailtrajectory.h

@@ -32,6 +32,8 @@
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/stringproperty.h>
 
+#include <ghoul/opengl/programobject.h>
+
 namespace openspace {
 
 namespace documentation { struct Documentation; }

modules/debugging/rendering/renderabledebugplane.h

@@ -28,6 +28,7 @@
 #include <openspace/rendering/renderable.h>
 
 #include <openspace/properties/stringproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/util/updatestructures.h>
 
 namespace ghoul {

modules/fieldlines/rendering/renderablefieldlines.cpp

@@ -28,10 +28,12 @@
 #include <openspace/util/powerscaledcoordinate.h>
 #include <modules/kameleon/include/kameleonwrapper.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/util/updatestructures.h>
 
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/misc/assert.h>
+#include <ghoul/opengl/programobject.h>
 
 #include <fstream>
 

modules/galaxy/rendering/renderablegalaxy.cpp

@@ -41,6 +41,8 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 
+#include <ghoul/opengl/programobject.h>
+
 #include <fstream>
 
 

modules/globebrowsing/globes/pointglobe.cpp

@@ -31,6 +31,8 @@
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/updatestructures.h>
 
+#include <ghoul/opengl/programobject.h>
+
 namespace openspace {
 namespace globebrowsing {
 

modules/globebrowsing/globes/pointglobe.h

@@ -27,6 +27,8 @@
 
 #include <openspace/rendering/renderable.h>
 
+#include <ghoul/opengl/ghoul_gl.h>
+
 namespace ghoul { namespace opengl {
 class ProgramObject;
 } }

modules/iswa/rendering/datacygnet.cpp

@@ -30,6 +30,8 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <modules/iswa/util/dataprocessortext.h>
 
+#include <ghoul/opengl/programobject.h>
+
 namespace {
     const std::string _loggerCat = "DataCygnet";
 }

modules/iswa/rendering/dataplane.cpp

@@ -25,6 +25,8 @@
 #include <modules/iswa/rendering/dataplane.h>
 #include <modules/iswa/util/dataprocessortext.h>
 
+#include <ghoul/opengl/programobject.h>
+
 namespace {
     const std::string _loggerCat = "DataPlane";
 }

modules/iswa/rendering/datasphere.cpp

@@ -26,6 +26,8 @@
 #include <openspace/util/powerscaledsphere.h>
 #include <modules/iswa/util/dataprocessorjson.h>
 
+#include <ghoul/opengl/programobject.h>
+
 #ifdef WIN32
 #define _USE_MATH_DEFINES
 #include <math.h>

modules/iswa/rendering/iswacygnet.cpp

@@ -31,6 +31,8 @@
 #include <openspace/util/powerscaledcoordinate.h>
 #include <openspace/util/updatestructures.h>
 
+#include <ghoul/opengl/programobject.h>
+
 namespace {
     const std::string _loggerCat = "IswaCygnet";
 }

modules/iswa/rendering/textureplane.cpp

@@ -26,6 +26,7 @@
 #include <openspace/engine/openspaceengine.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
+#include <ghoul/opengl/programobject.h>
 
 namespace {
     const std::string _loggerCat = "TexturePlane";

modules/newhorizons/rendering/renderablecrawlingline.cpp

@@ -32,6 +32,8 @@
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/updatestructures.h>
 
+#include <ghoul/opengl/programobject.h>
+
 #include <ghoul/glm.h>
 
 namespace {

modules/newhorizons/rendering/renderablecrawlingline.h

@@ -28,6 +28,7 @@
 #include <openspace/rendering/renderable.h>
 
 #include <ghoul/glm.h>
+#include <ghoul/opengl/ghoul_gl.h>
 
 namespace openspace {
 

modules/newhorizons/rendering/renderablefov.h

@@ -34,6 +34,7 @@
 #include <openspace/util/spicemanager.h>
 
 #include <ghoul/glm.h>
+#include <ghoul/opengl/ghoul_gl.h>
 
 namespace ghoul {
 namespace opengl {

modules/newhorizons/rendering/renderablemodelprojection.cpp

@@ -31,6 +31,7 @@
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/scene/scene.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/time.h>
 #include <openspace/util/updatestructures.h>

modules/newhorizons/rendering/renderableplaneprojection.cpp

@@ -30,6 +30,7 @@
 #include <openspace/engine/configurationmanager.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/scene/scene.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/updatestructures.h>
 

modules/newhorizons/rendering/renderableplaneprojection.h

@@ -27,6 +27,8 @@
 
 #include <openspace/rendering/renderable.h>
 
+#include <ghoul/opengl/ghoul_gl.h>
+
 #include <memory>
 
 namespace ghoul {

modules/newhorizons/rendering/renderableshadowcylinder.h

@@ -33,10 +33,10 @@
 
 #include <openspace/util/spicemanager.h>
 
+#include <ghoul/opengl/ghoul_gl.h>
+
 namespace ghoul {
-namespace opengl {
-class ProgramObject;
-}
+namespace opengl { class ProgramObject; }
 }
 
 namespace openspace {

modules/newhorizons/util/projectioncomponent.cpp

@@ -36,6 +36,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/misc/dictionary.h>
+#include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/framebufferobject.h>
 #include <ghoul/opengl/textureconversion.h>
 #include <ghoul/opengl/textureunit.h>

modules/onscreengui/src/guiorigincomponent.cpp

@@ -28,6 +28,7 @@
 #include <openspace/interaction/interactionhandler.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/scene/scene.h>
 
 #include <ghoul/misc/assert.h>
 

modules/space/rendering/renderablerings.cpp

@@ -29,6 +29,7 @@
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/scene/scene.h>
 
 #include <ghoul/filesystem/filesystem>
 #include <ghoul/io/texture/texturereader.h>

modules/space/rendering/renderablestars.h

@@ -31,6 +31,8 @@
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 
+#include <ghoul/opengl/ghoul_gl.h>
+
 namespace ghoul {
 namespace filesystem { class File; }
 namespace opengl {

modules/space/rendering/simplespheregeometry.cpp

@@ -25,6 +25,7 @@
 #include <modules/space/rendering/simplespheregeometry.h>
 #include <openspace/util/powerscaledsphere.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/rendering/renderable.h>
 
 namespace {
     const std::string _loggerCat = "SimpleSphereGeometry";

src/interaction/interactionmode.cpp

@@ -29,6 +29,7 @@
 #include <openspace/query/query.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <openspace/scene/scene.h>
 #include <openspace/util/time.h>
 #include <openspace/util/keys.h>
 

src/rendering/renderengine.cpp

@@ -27,6 +27,7 @@
 #ifdef OPENSPACE_MODULE_NEWHORIZONS_ENABLED
 #include <modules/newhorizons/util/imagesequencer.h>
 #endif
+#include <openspace/util/syncdata.h>
 
 #include <openspace/engine/configurationmanager.h>
 #include <openspace/engine/openspaceengine.h>
@@ -38,11 +39,16 @@
 #include <openspace/rendering/framebufferrenderer.h>
 #include <openspace/rendering/raycastermanager.h>
 #include <openspace/scene/scene.h>
+#include <openspace/performance/performancemanager.h>
+#include <openspace/rendering/renderer.h>
 
 #include <openspace/util/camera.h>
 #include <openspace/util/time.h>
 #include <openspace/util/screenlog.h>
 #include <openspace/util/spicemanager.h>
+#include <openspace/rendering/raycastermanager.h>
+#include <openspace/rendering/screenspacerenderable.h>
+#include <openspace/scripting/scriptengine.h>
 
 #include <ghoul/glm.h>
 #include <ghoul/font/font.h>

src/rendering/screenspacerenderable.cpp

@@ -31,7 +31,7 @@
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/camera.h>
 #include <openspace/util/factorymanager.h>
-
+#include <openspace/scripting/scriptengine.h>
 
 #ifdef WIN32
 #define _USE_MATH_DEFINES

src/scene/scenegraphnode.cpp

@@ -24,9 +24,21 @@
 
 #include <openspace/scene/scenegraphnode.h>
 
+#include <modules/base/translation/statictranslation.h>
+#include <modules/base/rotation/staticrotation.h>
+#include <modules/base/scale/staticscale.h>
+
+#include <openspace/engine/openspaceengine.h>
 #include <openspace/query/query.h>
+#include <openspace/rendering/renderable.h>
+#include <openspace/scene/rotation.h>
+#include <openspace/scene/scale.h>
+#include <openspace/scene/scene.h>
+#include <openspace/scene/translation.h>
+#include <openspace/util/factorymanager.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/time.h>
+#include <openspace/util/updatestructures.h>
 
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/logging/consolelog.h>
@@ -36,13 +48,6 @@
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/shaderobject.h>
 
-#include <modules/base/translation/statictranslation.h>
-#include <modules/base/rotation/staticrotation.h>
-#include <modules/base/scale/staticscale.h>
-
-#include <openspace/engine/openspaceengine.h>
-#include <openspace/util/factorymanager.h>
-
 #include <cctype>
 #include <chrono>
 

tests/test_sceneloader.inl

@@ -28,6 +28,7 @@
 #include <openspace/scene/scenegraphnode.h>
 #include <openspace/documentation/documentation.h>
 #include <ghoul/misc/dictionaryluaformatter.h>
+#include <openspace/scene/scene.h>
 
 #include <ghoul/lua/lua_helper.h>
 #include <fstream>