[misc] fixed a header leak (and reduced compilation time)

PanosK92 · Jan 23, 2025 · 97b470d · 97b470d
1 parent a034fe7
commit 97b470d
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 9 deletions.
diff --git a/editor/Widgets/FileDialog.cpp b/editor/Widgets/FileDialog.cpp
@@ -23,8 +23,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "FileDialog.h"
 #include "../ImGui/Source/imgui_internal.h"
 #include "../ImGui/Source/imgui_stdlib.h"
-#include "Rendering/Mesh.h"
 #include "../Widgets/Viewport.h"
+#include "Rendering/Mesh.h"
+#include <Rendering/Material.h>
 //=========================================
 
 //= NAMESPACES ===============

diff --git a/runtime/Game/Game.cpp b/runtime/Game/Game.cpp
@@ -35,6 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "../Core/ProgressTracker.h"
 #include "../Rendering/Mesh.h"
 #include "../Rendering/Renderer.h"
+#include "../Rendering/Material.h"
 #include "../Resource/ResourceCache.h"
 #include "../Input/Input.h"
 //============================================

diff --git a/runtime/Math/BoundingBox.h b/runtime/Math/BoundingBox.h
@@ -24,6 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //= INCLUDES =======
 #include "Helper.h"
 #include "Vector3.h"
+#include <array>
 //==================
 
 namespace spartan

diff --git a/runtime/Rendering/Mesh.h b/runtime/Rendering/Mesh.h
@@ -24,14 +24,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //= INCLUDES =====================
 #include <vector>
 #include <mutex>
-#include "Material.h"
 #include "../RHI/RHI_Vertex.h"
 #include "../Math/BoundingBox.h"
 #include "../Resource/IResource.h"
 //================================
 
 namespace spartan
 {
+    class RHI_Buffer;
+
     enum class MeshFlags : uint32_t
     {
         ImportRemoveRedundantData = 1 << 0,

diff --git a/runtime/Rendering/Renderer.cpp b/runtime/Rendering/Renderer.cpp
@@ -22,6 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //= INCLUDES ===============================
 #include "pch.h"
 #include "Renderer.h"
+#include "Material.h"
 #include "ThreadPool.h"
 #include "ProgressTracker.h"
 #include "../Profiling/RenderDoc.h"

diff --git a/runtime/Rendering/Renderer.h b/runtime/Rendering/Renderer.h
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 namespace spartan
 {
-    //= FWD DECLARATIONS =
+    class Material;
     class Entity;
     class Camera;
     class Light;
@@ -44,7 +44,6 @@ namespace spartan
         class BoundingBox;
         class Frustum;
     }
-    //====================
 
     class Renderer
     {

diff --git a/runtime/Rendering/Renderer_Passes.cpp b/runtime/Rendering/Renderer_Passes.cpp
@@ -29,6 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "../RHI/RHI_CommandList.h"
 #include "../RHI/RHI_Buffer.h"
 #include "../RHI/RHI_Shader.h"
+#include "../Rendering/Material.h"
 #ifdef _MSC_VER
 #include "../RHI/RHI_FidelityFX.h"
 #endif

diff --git a/runtime/Rendering/Renderer_Resources.cpp b/runtime/Rendering/Renderer_Resources.cpp
@@ -23,6 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "pch.h"
 #include "Window.h"
 #include "Renderer.h"
+#include "Material.h"
 #include "../Core/GeometryProcessing.h"
 #include "../World/Components/Light.h"
 #include "../Resource/ResourceCache.h"

diff --git a/runtime/Resource/IResource.cpp b/runtime/Resource/IResource.cpp
@@ -27,6 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "../Rendering/Font/Font.h"
 #include "../Rendering/Animation.h"
 #include "../Rendering/Mesh.h"
+#include "../Rendering/Material.h"
 //=================================
 
 //= NAMESPACES ==========

diff --git a/runtime/Resource/Import/ModelImporter.cpp b/runtime/Resource/Import/ModelImporter.cpp
@@ -26,6 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "../../RHI/RHI_Texture.h"
 #include "../../Rendering/Animation.h"
 #include "../../Rendering/Mesh.h"
+#include "../../Rendering/Material.h"
 #include "../../World/World.h"
 #include "../../World/Entity.h"
 #include "../../World/Components/Light.h"

diff --git a/runtime/Resource/ResourceCache.h b/runtime/Resource/ResourceCache.h
@@ -21,11 +21,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-//= INCLUDES ==============
+//= INCLUDES =====================
 #include "IResource.h"
 #include "../Logging/Log.h"
 #include <mutex>
-//=========================
+#include "../Rendering/Material.h"
+//================================
 
 namespace spartan
 {

diff --git a/runtime/World/Components/Light.h b/runtime/World/Components/Light.h
@@ -33,9 +33,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 namespace spartan
 {
-    //= FWD DECLARATIONS =
     class Camera;
-    //====================
+    class RHI_Texture;
 
     enum class LightType
     {

diff --git a/runtime/World/Components/Renderable.cpp b/runtime/World/Components/Renderable.cpp
@@ -23,10 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "pch.h"
 #include "Renderable.h"
 #include "../Entity.h"
-#include "../Rendering/Renderer.h"
 #include "../RHI/RHI_Buffer.h"
 #include "../../IO/FileStream.h"
 #include "../../Resource/ResourceCache.h"
+#include "../../Rendering/Renderer.h"
+#include "../../Rendering/Material.h"
 #include "../../Rendering/GridPartitioning.h"
 //===========================================
 

diff --git a/runtime/World/Components/Terrain.cpp b/runtime/World/Components/Terrain.cpp
@@ -29,6 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "../../IO/FileStream.h"
 #include "../../Resource/ResourceCache.h"
 #include "../../Rendering/Mesh.h"
+#include "../../Rendering/Material.h"
 #include "../../Core/ThreadPool.h"
 #include "../../Core/ProgressTracker.h"
 #include "../../Core/GeometryProcessing.h"