From cd0f6d038f0e4890b3b15b9e10bc89be2cf1d5e6 Mon Sep 17 00:00:00 2001 From: Dynamitos Date: Sat, 14 Mar 2026 13:53:04 +0100 Subject: [PATCH] Reorganize includes --- src/Editor/main.cpp | 5 +---- src/Engine/Graphics/RenderPass/CachedDepthPass.h | 1 + src/Engine/Graphics/RenderPass/DepthCullingPass.h | 1 + src/Engine/Graphics/RenderPass/RayTracingPass.cpp | 2 ++ src/Engine/Graphics/RenderPass/RayTracingPass.h | 1 + src/Engine/Graphics/RenderPass/RenderPass.cpp | 1 + src/Engine/Graphics/RenderPass/RenderPass.h | 5 +---- src/Engine/Graphics/RenderPass/ShadowPass.h | 1 + src/Engine/Graphics/RenderPass/ToneMappingPass.cpp | 1 + src/Engine/Graphics/RenderPass/VisibilityPass.cpp | 1 + src/Engine/Graphics/RenderPass/WaterRenderer.cpp | 1 + src/Engine/Graphics/RenderPass/WaterRenderer.h | 1 + src/Engine/Graphics/slang-compile.cpp | 2 +- 13 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Editor/main.cpp b/src/Editor/main.cpp index 377c2d3..c77a4f7 100644 --- a/src/Editor/main.cpp +++ b/src/Editor/main.cpp @@ -6,10 +6,7 @@ #include "Asset/MeshLoader.h" #include "Asset/TextureLoader.h" #include "Graphics/Initializer.h" -#ifdef __APPLE__ -#include "Graphics/Metal/Graphics.h" -#else -#endif +#include "Material/Material.h" #include "Graphics/StaticMeshVertexData.h" #include "Graphics/Vulkan/Graphics.h" #include "Window/PlayView.h" diff --git a/src/Engine/Graphics/RenderPass/CachedDepthPass.h b/src/Engine/Graphics/RenderPass/CachedDepthPass.h index bbb8ffa..16aa1c5 100644 --- a/src/Engine/Graphics/RenderPass/CachedDepthPass.h +++ b/src/Engine/Graphics/RenderPass/CachedDepthPass.h @@ -1,6 +1,7 @@ #pragma once #include "RenderPass.h" #include "Graphics/Query.h" +#include "Scene/Scene.h" namespace Seele { class CachedDepthPass : public RenderPass { diff --git a/src/Engine/Graphics/RenderPass/DepthCullingPass.h b/src/Engine/Graphics/RenderPass/DepthCullingPass.h index 2c55be5..a708d53 100644 --- a/src/Engine/Graphics/RenderPass/DepthCullingPass.h +++ b/src/Engine/Graphics/RenderPass/DepthCullingPass.h @@ -3,6 +3,7 @@ #include "Graphics/Query.h" #include "MinimalEngine.h" #include "RenderPass.h" +#include "Scene/Scene.h" namespace Seele { class DepthCullingPass : public RenderPass { diff --git a/src/Engine/Graphics/RenderPass/RayTracingPass.cpp b/src/Engine/Graphics/RenderPass/RayTracingPass.cpp index 5c72fb8..e3a684a 100644 --- a/src/Engine/Graphics/RenderPass/RayTracingPass.cpp +++ b/src/Engine/Graphics/RenderPass/RayTracingPass.cpp @@ -5,6 +5,8 @@ #include "Graphics/Shader.h" #include "Graphics/StaticMeshVertexData.h" #include "RenderPass.h" +#include "Material/Material.h" +#include "Material/MaterialInstance.h" using namespace Seele; diff --git a/src/Engine/Graphics/RenderPass/RayTracingPass.h b/src/Engine/Graphics/RenderPass/RayTracingPass.h index 7abdb27..25f7c06 100644 --- a/src/Engine/Graphics/RenderPass/RayTracingPass.h +++ b/src/Engine/Graphics/RenderPass/RayTracingPass.h @@ -1,6 +1,7 @@ #pragma once #include "Graphics/Graphics.h" #include "RenderPass.h" +#include "Scene/Scene.h" namespace Seele { class RayTracingPass : public RenderPass { diff --git a/src/Engine/Graphics/RenderPass/RenderPass.cpp b/src/Engine/Graphics/RenderPass/RenderPass.cpp index a51ec36..127fe13 100644 --- a/src/Engine/Graphics/RenderPass/RenderPass.cpp +++ b/src/Engine/Graphics/RenderPass/RenderPass.cpp @@ -1,4 +1,5 @@ #include "RenderPass.h" +#include "Graphics/Graphics.h" using namespace Seele; diff --git a/src/Engine/Graphics/RenderPass/RenderPass.h b/src/Engine/Graphics/RenderPass/RenderPass.h index 7702afc..3fb9cd0 100644 --- a/src/Engine/Graphics/RenderPass/RenderPass.h +++ b/src/Engine/Graphics/RenderPass/RenderPass.h @@ -1,12 +1,9 @@ #pragma once #include "Component/Camera.h" -#include "Graphics/VertexData.h" -#include "Material/MaterialInstance.h" #include "Math/Math.h" #include "MinimalEngine.h" #include "RenderGraphResources.h" -#include "Scene/Scene.h" - +#include "Graphics/Descriptor.h" namespace Seele { DECLARE_NAME_REF(Gfx, Viewport) diff --git a/src/Engine/Graphics/RenderPass/ShadowPass.h b/src/Engine/Graphics/RenderPass/ShadowPass.h index e2bc290..1d77923 100644 --- a/src/Engine/Graphics/RenderPass/ShadowPass.h +++ b/src/Engine/Graphics/RenderPass/ShadowPass.h @@ -1,6 +1,7 @@ #pragma once #include "Graphics/Buffer.h" #include "Graphics/Descriptor.h" +#include "Scene/Scene.h" #include "RenderPass.h" namespace Seele { diff --git a/src/Engine/Graphics/RenderPass/ToneMappingPass.cpp b/src/Engine/Graphics/RenderPass/ToneMappingPass.cpp index c43ddc3..f7b66df 100644 --- a/src/Engine/Graphics/RenderPass/ToneMappingPass.cpp +++ b/src/Engine/Graphics/RenderPass/ToneMappingPass.cpp @@ -1,4 +1,5 @@ #include "ToneMappingPass.h" +#include "Graphics/Graphics.h" using namespace Seele; diff --git a/src/Engine/Graphics/RenderPass/VisibilityPass.cpp b/src/Engine/Graphics/RenderPass/VisibilityPass.cpp index e98721f..0c17c73 100644 --- a/src/Engine/Graphics/RenderPass/VisibilityPass.cpp +++ b/src/Engine/Graphics/RenderPass/VisibilityPass.cpp @@ -1,5 +1,6 @@ #include "VisibilityPass.h" #include "Graphics/Shader.h" +#include "Graphics/Graphics.h" using namespace Seele; diff --git a/src/Engine/Graphics/RenderPass/WaterRenderer.cpp b/src/Engine/Graphics/RenderPass/WaterRenderer.cpp index 7468c3d..30eac3b 100644 --- a/src/Engine/Graphics/RenderPass/WaterRenderer.cpp +++ b/src/Engine/Graphics/RenderPass/WaterRenderer.cpp @@ -3,6 +3,7 @@ #include "Component/WaterTile.h" #include "Graphics/Graphics.h" #include "Graphics/Shader.h" +#include "Asset/TextureAsset.h" using namespace Seele; diff --git a/src/Engine/Graphics/RenderPass/WaterRenderer.h b/src/Engine/Graphics/RenderPass/WaterRenderer.h index d4a314e..6a2fa19 100644 --- a/src/Engine/Graphics/RenderPass/WaterRenderer.h +++ b/src/Engine/Graphics/RenderPass/WaterRenderer.h @@ -1,5 +1,6 @@ #pragma once #include "RenderPass.h" +#include "Scene/Scene.h" namespace Seele { class WaterRenderer { diff --git a/src/Engine/Graphics/slang-compile.cpp b/src/Engine/Graphics/slang-compile.cpp index 6873716..50b5978 100644 --- a/src/Engine/Graphics/slang-compile.cpp +++ b/src/Engine/Graphics/slang-compile.cpp @@ -85,7 +85,7 @@ void Seele::beginCompilation(const ShaderCompilationInfo& info, SlangCompileTarg targetDesc.flags = SLANG_TARGET_FLAG_GENERATE_SPIRV_DIRECTLY; sessionDesc.targetCount = 1; sessionDesc.targets = &targetDesc; - StaticArray searchPaths = {"shaders/", "shaders/lib/", "shaders/raytracing/", "shaders/terrain", "shaders/game", "shaders/generated/"}; + StaticArray searchPaths = {"shaders/", "shaders/lib/", "shaders/raytracing/", "shaders/terrain", "shaders/game", "shaders/generated/", "Seele/shaders/lib/"}; sessionDesc.searchPaths = searchPaths.data(); sessionDesc.searchPathCount = searchPaths.size();