Global pass over optimizing includes (#3862)

include/openspace/rendering/framebufferrenderer.h

@@ -29,11 +29,9 @@
 #include <openspace/rendering/deferredcasterlistener.h>
 
 #include <ghoul/glm.h>
-#include <ghoul/misc/dictionary.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/uniformcache.h>
 #include <map>
-#include <string>
 #include <vector>
 
 namespace ghoul { class Dictionary; }

include/openspace/rendering/loadingscreen.h

@@ -28,9 +28,6 @@
 #include <openspace/util/screenlog.h>
 #include <ghoul/glm.h>
 #include <ghoul/misc/boolean.h>
-#include <ghoul/opengl/ghoul_gl.h>
-#include <ghoul/opengl/uniformcache.h>
-#include <atomic>
 #include <memory>
 #include <mutex>
 #include <random>

include/openspace/rendering/luaconsole.h

@@ -32,8 +32,6 @@
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/vector/vec4property.h>
 #include <openspace/util/keys.h>
-#include <ghoul/opengl/ghoul_gl.h>
-#include <ghoul/opengl/uniformcache.h>
 #include <map>
 #include <memory>
 #include <string>

include/openspace/rendering/renderable.h

@@ -30,8 +30,6 @@
 
 #include <openspace/properties/misc/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
-#include <openspace/properties/scalar/doubleproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/scene/scenegraphnode.h>
 #include <ghoul/misc/managedmemoryuniqueptr.h>
 #include <string_view>

include/openspace/rendering/renderengine.h

@@ -28,8 +28,6 @@
 #include <openspace/properties/propertyowner.h>
 
 #include <openspace/properties/list/intlistproperty.h>
-#include <openspace/properties/misc/optionproperty.h>
-#include <openspace/properties/misc/triggerproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
@@ -40,14 +38,14 @@
 #include <filesystem>
 
 namespace ghoul {
-    namespace fontrendering { class Font; }
-    namespace opengl {
-        class ProgramObject;
-        class OpenGLStateCache;
-    } // namespace opengl
+namespace fontrendering { class Font; }
+namespace opengl {
+    class ProgramObject;
+    class OpenGLStateCache;
+} // namespace opengl
 
-    class Dictionary;
-    class SharedMemory;
+class Dictionary;
+class SharedMemory;
 } // ghoul
 
 namespace openspace {

include/openspace/rendering/screenspacerenderable.h

@@ -33,7 +33,6 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/properties/vector/vec4property.h>
-#include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/uniformcache.h>
 #include <memory>
 

include/openspace/rendering/screenspacerenderabletext.h

@@ -31,12 +31,17 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <ghoul/font/fontrenderer.h>
 
-namespace ghoul { class Dictionary; }
-namespace ghoul::opengl {
+namespace ghoul {
+
+class Dictionary;
+
+namespace fontrendering { class Font; }
+namespace opengl {
     class FramebufferObject;
     class Texture;
-} // namespace ghoul::opengl
-namespace ghoul::fontrendering { class Font; }
+} // namespace opengl
+
+} // namespace ghoul
 
 namespace openspace {
 

include/openspace/rendering/texturecomponent.h

@@ -29,7 +29,7 @@
 #include <filesystem>
 
 namespace ghoul::filesystem { class File; }
-namespace ghoul::opengl {class Texture; }
+namespace ghoul::opengl { class Texture; }
 
 namespace openspace {
 

include/openspace/rendering/transferfunction.h

@@ -29,7 +29,6 @@
 #include <filesystem>
 #include <functional>
 #include <memory>
-#include <string>
 
 namespace ghoul::filesystem { class File; }
 namespace ghoul::opengl { class Texture; }
@@ -57,7 +56,6 @@ public:
 
 private:
     void setTextureFromImage();
-    void uploadTexture();
 
     std::filesystem::path _filepath;
     std::unique_ptr<ghoul::filesystem::File> _file;

include/openspace/rendering/volumeraycaster.h

@@ -27,8 +27,6 @@
 
 #include <ghoul/glm.h>
 #include <filesystem>
-#include <string>
-#include <vector>
 
 namespace ghoul::opengl {
     class Texture;