Fixing more includes and forward declarations (#3876)

include/openspace/rendering/colormappingcomponent.h

@@ -34,7 +34,14 @@
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec4property.h>
+#include <ghoul/glm.h>
 #include <ghoul/opengl/texture.h>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace ghoul { class Dictionary; }
 
 namespace openspace {
 

include/openspace/rendering/dashboard.h

@@ -32,7 +32,9 @@
 #include <openspace/properties/vector/ivec2property.h>
 #include <openspace/rendering/dashboarditem.h>
 #include <ghoul/glm.h>
+#include <chrono>
 #include <memory>
+#include <string>
 #include <vector>
 
 namespace openspace {

include/openspace/rendering/dashboarditem.h

@@ -29,6 +29,7 @@
 
 #include <openspace/properties/scalar/boolproperty.h>
 #include <ghoul/glm.h>
+#include <memory>
 
 namespace ghoul { class Dictionary; }
 

include/openspace/rendering/dashboardtextitem.h

@@ -30,13 +30,10 @@
 #include <openspace/properties/misc/stringproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 
-namespace ghoul { class Dictionary; }
 namespace ghoul::fontrendering { class Font; }
 
 namespace openspace {
 
-namespace documentation { struct Documentation; }
-
 class DashboardTextItem : public DashboardItem {
 public:
     explicit DashboardTextItem(const ghoul::Dictionary& dictionary);

include/openspace/rendering/deferredcaster.h

@@ -26,7 +26,6 @@
 #define __OPENSPACE_CORE___DEFERREDCASTER___H
 
 #include <filesystem>
-#include <string>
 
 namespace ghoul::opengl {
     class Texture;
@@ -35,21 +34,21 @@ namespace ghoul::opengl {
 
 namespace openspace {
 
-struct RenderData;
 struct DeferredcastData;
+struct RenderData;
 struct UpdateData;
 
 class Deferredcaster {
 public:
     virtual ~Deferredcaster() = default;
 
-    virtual void preRaycast(const RenderData& /*renderData*/,
-        const DeferredcastData& /*deferredData*/,
-        ghoul::opengl::ProgramObject& /*program*/) {}
+    virtual void preRaycast(const RenderData& renderData,
+        const DeferredcastData& deferredData,
+        ghoul::opengl::ProgramObject& program);
 
-    virtual void postRaycast(const RenderData& /*renderData*/,
-        const DeferredcastData& /*deferredData*/,
-        ghoul::opengl::ProgramObject& /*program*/) {}
+    virtual void postRaycast(const RenderData& renderData,
+        const DeferredcastData& deferredData,
+        ghoul::opengl::ProgramObject& program);
 
     virtual std::filesystem::path deferredcastVSPath() const = 0;
 

include/openspace/rendering/framebufferrenderer.h

@@ -36,7 +36,6 @@
 
 namespace ghoul { class Dictionary; }
 namespace ghoul::filesystem { class File; }
-
 namespace ghoul::opengl {
     class ProgramObject;
     class Texture;
@@ -186,11 +185,9 @@ private:
         std::unique_ptr<ghoul::opengl::ProgramObject>
     >;
 
-    void resolveMSAA(float blackoutFactor);
     void applyTMO(float blackoutFactor, const glm::ivec4& viewport);
     void applyFXAA(const glm::ivec4& viewport);
     void updateDownscaleTextures() const;
-    void updateExitVolumeTextures();
     void writeDownscaledVolume(const glm::ivec4& viewport);
 
     std::map<VolumeRaycaster*, RaycastData> _raycastData;

include/openspace/rendering/helper.h

@@ -25,7 +25,11 @@
 #ifndef __OPENSPACE_CORE___HELPER___H__
 #define __OPENSPACE_CORE___HELPER___H__
 
+#include <ghoul/glm.h>
+#include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/uniformcache.h>
+#include <memory>
+#include <vector>
 
 namespace ghoul::opengl {
     class ProgramObject;
@@ -39,13 +43,7 @@ namespace openspace {
 
 namespace openspace::rendering::helper {
 
-enum class Anchor {
-    Center,
-    NW,
-    NE,
-    SW,
-    SE
-};
+enum class Anchor { Center, NW, NE, SW, SE };
 
 void initialize();
 void deinitialize();

include/openspace/rendering/labelscomponent.h

@@ -36,13 +36,15 @@
 #include <openspace/util/distanceconversion.h>
 #include <ghoul/glm.h>
 #include <filesystem>
+#include <memory>
 
+namespace ghoul { class Dictionary; }
 namespace ghoul::fontrendering { class Font; }
 
 namespace openspace {
-struct RenderData;
 
 namespace documentation { struct Documentation; }
+struct RenderData;
 
 class LabelsComponent : public properties::PropertyOwner, public Fadeable {
 public:

include/openspace/rendering/loadingscreen.h

@@ -28,14 +28,17 @@
 #include <openspace/util/screenlog.h>
 #include <ghoul/glm.h>
 #include <ghoul/misc/boolean.h>
+#include <chrono>
+#include <cstdint>
 #include <memory>
 #include <mutex>
 #include <random>
+#include <string>
+#include <vector>
 
 // #define LOADINGSCREEN_DEBUGGING
 
 namespace ghoul::fontrendering { class Font; }
-
 namespace ghoul::opengl {
     class ProgramObject;
     class Texture;

include/openspace/rendering/luaconsole.h

@@ -32,9 +32,11 @@
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/vector/vec4property.h>
 #include <openspace/util/keys.h>
+#include <functional>
 #include <map>
 #include <memory>
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace ghoul::fontrendering { class Font; }

include/openspace/rendering/raycastermanager.h

@@ -29,8 +29,8 @@
 
 namespace openspace {
 
-class VolumeRaycaster;
 class RaycasterListener;
+class VolumeRaycaster;
 
 class RaycasterManager {
 public:

include/openspace/rendering/renderable.h

@@ -32,16 +32,22 @@
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <ghoul/misc/managedmemoryuniqueptr.h>
+#include <functional>
+#include <optional>
 #include <string_view>
+#include <tuple>
 
-namespace ghoul { class Dictionary; }
-namespace ghoul::opengl {
-    class ProgramObject;
-    class Texture;
-} // namespace ghoul::opengl
+namespace ghoul {
+    namespace opengl {
+        class ProgramObject;
+        class Texture;
+    } // namespace opengl
+    class Dictionary;
+} // namespace ghoul
 
 namespace openspace {
 
+namespace documentation { struct Documentation; }
 class Camera;
 class Ellipsoid;
 struct RenderData;
@@ -49,8 +55,6 @@ struct RendererTasks;
 struct SurfacePositionHandle;
 struct UpdateData;
 
-namespace documentation { struct Documentation; }
-
 // Unfortunately we can't move this struct into the Renderable until
 // https://bugs.llvm.org/show_bug.cgi?id=36684 is fixed
 struct RenderableSettings {

include/openspace/rendering/renderengine.h

@@ -34,27 +34,30 @@
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/properties/vector/vec4property.h>
 #include <openspace/rendering/framebufferrenderer.h>
+#include <cstdint>
 #include <chrono>
 #include <filesystem>
+#include <memory>
+#include <string>
+#include <string_view>
+#include <vector>
 
 namespace ghoul {
-namespace fontrendering { class Font; }
-namespace opengl {
-    class ProgramObject;
-    class OpenGLStateCache;
-} // namespace opengl
-
-class Dictionary;
-class SharedMemory;
+    namespace fontrendering { class Font; }
+    namespace opengl {
+        class ProgramObject;
+        class OpenGLStateCache;
+    } // namespace opengl
+    class Dictionary;
+    class SharedMemory;
 } // ghoul
 
 namespace openspace {
 
 namespace scripting { struct LuaLibrary; }
-
 class Camera;
-class RaycasterManager;
 class DeferredcasterManager;
+class RaycasterManager;
 class Scene;
 class SceneManager;
 class ScreenLog;

include/openspace/rendering/screenspacerenderable.h

@@ -33,14 +33,17 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/properties/vector/vec4property.h>
+#include <ghoul/glm.h>
 #include <ghoul/opengl/uniformcache.h>
 #include <memory>
 
+namespace ghoul { class Dictionary; }
 namespace ghoul::opengl { class ProgramObject; }
 
 namespace openspace {
 
 namespace documentation { struct Documentation; }
+struct RenderData;
 
 /**
  * The base class for screen space images and screen space framebuffers. This base class

include/openspace/rendering/screenspacerenderableframebuffer.h

@@ -28,16 +28,12 @@
 #include <openspace/rendering/screenspacerenderable.h>
 
 #include <openspace/properties/vector/vec2property.h>
-
-namespace ghoul::opengl {
-    class FramebufferObject;
-    class Texture;
-} // namespace ghoul::opengl
+#include <ghoul/opengl/framebufferobject.h>
+#include <ghoul/opengl/texture.h>
+#include <functional>
 
 namespace openspace {
 
-namespace documentation { struct Documentation; }
-
 /**
  * Creates a texture by rendering to a framebuffer, this is then used on a screen space
  * plane. This class lets you add renderfunctions that should render to a framebuffer with

include/openspace/rendering/screenspacerenderabletext.h

@@ -29,24 +29,13 @@
 
 #include <openspace/properties/misc/stringproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
+#include <ghoul/font/font.h>
 #include <ghoul/font/fontrenderer.h>
-
-namespace ghoul {
-
-class Dictionary;
-
-namespace fontrendering { class Font; }
-namespace opengl {
-    class FramebufferObject;
-    class Texture;
-} // namespace opengl
-
-} // namespace ghoul
+#include <ghoul/opengl/framebufferobject.h>
+#include <ghoul/opengl/texture.h>
 
 namespace openspace {
 
-namespace documentation { struct Documentation; }
-
 class ScreenSpaceRenderableText : public ScreenSpaceRenderable {
 public:
     explicit ScreenSpaceRenderableText(const ghoul::Dictionary& dictionary);

include/openspace/rendering/texturecomponent.h

@@ -27,6 +27,7 @@
 
 #include <ghoul/opengl/texture.h>
 #include <filesystem>
+#include <memory>
 
 namespace ghoul::filesystem { class File; }
 namespace ghoul::opengl { class Texture; }

include/openspace/rendering/volumeraycaster.h

@@ -35,27 +35,24 @@ namespace ghoul::opengl {
 
 namespace openspace {
 
-struct RenderData;
 struct RaycastData;
+struct RenderData;
 
 class VolumeRaycaster {
 public:
-    /**
-     * Destructor.
-     */
     virtual ~VolumeRaycaster() = default;
 
     /**
      * Render the volume's entry points (front face of the bounding geometry).
      */
-    virtual void renderEntryPoints(const RenderData& /*data*/,
-        ghoul::opengl::ProgramObject& /*program*/) = 0;
+    virtual void renderEntryPoints(const RenderData& data,
+        ghoul::opengl::ProgramObject& program) = 0;
 
     /**
      * Render the volume's exit points (back face of the bounding geometry).
      */
-    virtual void renderExitPoints(const RenderData& /*data*/,
-        ghoul::opengl::ProgramObject& /*program*/) = 0;
+    virtual void renderExitPoints(const RenderData& data,
+        ghoul::opengl::ProgramObject& program) = 0;
 
     /**
      * Prepare the volume for the ABuffer's resolve step. Make sure textures are up to