diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index a999d98c..74caa0a7 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -441,11 +441,11 @@ add_library(XCEngine STATIC ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Planning/SceneRenderRequestPlanner.h ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Planning/SceneRenderRequestUtils.h ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Picking/ObjectIdCodec.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Extraction/RenderSceneExtractor.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Extraction/RenderSceneUtility.h ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderMaterialResolve.h ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderMaterialStateUtils.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderSceneUtility.h ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderPass.h - ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderSceneExtractor.h ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderPipeline.h ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderPipelineAsset.h ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderSurface.h @@ -469,8 +469,8 @@ add_library(XCEngine STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Passes/BuiltinInfiniteGridPass.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Passes/BuiltinObjectIdOutlinePass.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/RenderSurface.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/RenderSceneExtractor.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/RenderSceneUtility.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Extraction/RenderSceneExtractor.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Extraction/RenderSceneUtility.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/RenderResourceCache.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Planning/SceneRenderRequestPlanner.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Execution/SceneRenderer.cpp diff --git a/engine/include/XCEngine/Rendering/Execution/CameraRenderer.h b/engine/include/XCEngine/Rendering/Execution/CameraRenderer.h index 5ae5531d..f3de2152 100644 --- a/engine/include/XCEngine/Rendering/Execution/CameraRenderer.h +++ b/engine/include/XCEngine/Rendering/Execution/CameraRenderer.h @@ -1,7 +1,7 @@ #pragma once +#include #include -#include #include #include diff --git a/engine/include/XCEngine/Rendering/RenderSceneExtractor.h b/engine/include/XCEngine/Rendering/Extraction/RenderSceneExtractor.h similarity index 100% rename from engine/include/XCEngine/Rendering/RenderSceneExtractor.h rename to engine/include/XCEngine/Rendering/Extraction/RenderSceneExtractor.h diff --git a/engine/include/XCEngine/Rendering/RenderSceneUtility.h b/engine/include/XCEngine/Rendering/Extraction/RenderSceneUtility.h similarity index 100% rename from engine/include/XCEngine/Rendering/RenderSceneUtility.h rename to engine/include/XCEngine/Rendering/Extraction/RenderSceneUtility.h diff --git a/engine/src/Rendering/RenderSceneExtractor.cpp b/engine/src/Rendering/Extraction/RenderSceneExtractor.cpp similarity index 98% rename from engine/src/Rendering/RenderSceneExtractor.cpp rename to engine/src/Rendering/Extraction/RenderSceneExtractor.cpp index 1d134e54..97e152bd 100644 --- a/engine/src/Rendering/RenderSceneExtractor.cpp +++ b/engine/src/Rendering/Extraction/RenderSceneExtractor.cpp @@ -1,9 +1,9 @@ -#include "Rendering/RenderSceneExtractor.h" +#include "Rendering/Extraction/RenderSceneExtractor.h" #include "Components/CameraComponent.h" #include "Components/GameObject.h" #include "Components/LightComponent.h" -#include "Rendering/RenderSceneUtility.h" +#include "Rendering/Extraction/RenderSceneUtility.h" #include "Scene/Scene.h" #include diff --git a/engine/src/Rendering/RenderSceneUtility.cpp b/engine/src/Rendering/Extraction/RenderSceneUtility.cpp similarity index 99% rename from engine/src/Rendering/RenderSceneUtility.cpp rename to engine/src/Rendering/Extraction/RenderSceneUtility.cpp index 40867cb8..27a91490 100644 --- a/engine/src/Rendering/RenderSceneUtility.cpp +++ b/engine/src/Rendering/Extraction/RenderSceneUtility.cpp @@ -1,4 +1,4 @@ -#include "Rendering/RenderSceneUtility.h" +#include "Rendering/Extraction/RenderSceneUtility.h" #include "Components/CameraComponent.h" #include "Components/GameObject.h" diff --git a/engine/src/Rendering/Passes/BuiltinDepthStylePassBase.cpp b/engine/src/Rendering/Passes/BuiltinDepthStylePassBase.cpp index 79417ce5..19d6acfe 100644 --- a/engine/src/Rendering/Passes/BuiltinDepthStylePassBase.cpp +++ b/engine/src/Rendering/Passes/BuiltinDepthStylePassBase.cpp @@ -1,7 +1,7 @@ #include "Rendering/Passes/BuiltinDepthStylePassBase.h" #include "RHI/RHICommandList.h" -#include "Rendering/RenderSceneExtractor.h" +#include "Rendering/Extraction/RenderSceneExtractor.h" #include "Rendering/RenderSurface.h" #include "Resources/Mesh/Mesh.h" diff --git a/engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp b/engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp index 45aaad3f..25ee3af0 100644 --- a/engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp +++ b/engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp @@ -7,7 +7,7 @@ #include "Rendering/BuiltinPassLayoutUtils.h" #include "Rendering/Detail/ShaderVariantUtils.h" #include "Rendering/RenderMaterialResolve.h" -#include "Rendering/RenderSceneExtractor.h" +#include "Rendering/Extraction/RenderSceneExtractor.h" #include "Rendering/RenderSurface.h" #include "Resources/Material/Material.h" #include "Resources/Mesh/Mesh.h" diff --git a/engine/src/Rendering/Passes/BuiltinObjectIdPass.cpp b/engine/src/Rendering/Passes/BuiltinObjectIdPass.cpp index fa23c742..4e6af5a6 100644 --- a/engine/src/Rendering/Passes/BuiltinObjectIdPass.cpp +++ b/engine/src/Rendering/Passes/BuiltinObjectIdPass.cpp @@ -2,7 +2,7 @@ #include "Core/Asset/ResourceManager.h" #include "RHI/RHICommandList.h" -#include "Rendering/RenderSceneExtractor.h" +#include "Rendering/Extraction/RenderSceneExtractor.h" #include "Rendering/RenderSurface.h" #include "Resources/Mesh/Mesh.h" diff --git a/engine/src/Rendering/Passes/BuiltinObjectIdPassResources.cpp b/engine/src/Rendering/Passes/BuiltinObjectIdPassResources.cpp index 57e31544..c051fe13 100644 --- a/engine/src/Rendering/Passes/BuiltinObjectIdPassResources.cpp +++ b/engine/src/Rendering/Passes/BuiltinObjectIdPassResources.cpp @@ -8,7 +8,7 @@ #include "RHI/RHIPipelineState.h" #include "Rendering/BuiltinPassLayoutUtils.h" #include "Rendering/Detail/ShaderVariantUtils.h" -#include "Rendering/RenderSceneExtractor.h" +#include "Rendering/Extraction/RenderSceneExtractor.h" #include "Rendering/RenderSurface.h" #include "Resources/BuiltinResources.h" #include "Resources/Mesh/Mesh.h" diff --git a/engine/src/Rendering/Planning/SceneRenderRequestPlanner.cpp b/engine/src/Rendering/Planning/SceneRenderRequestPlanner.cpp index dbe313c6..1571ea61 100644 --- a/engine/src/Rendering/Planning/SceneRenderRequestPlanner.cpp +++ b/engine/src/Rendering/Planning/SceneRenderRequestPlanner.cpp @@ -6,7 +6,7 @@ #include "Components/MeshRendererComponent.h" #include "Core/Math/Matrix4.h" #include "Core/Math/Quaternion.h" -#include "Rendering/RenderSceneUtility.h" +#include "Rendering/Extraction/RenderSceneUtility.h" #include "Rendering/Planning/SceneRenderRequestUtils.h" #include "Scene/Scene.h" diff --git a/tests/Rendering/unit/test_render_pass.cpp b/tests/Rendering/unit/test_render_pass.cpp index 50ba5d8b..0ba206c2 100644 --- a/tests/Rendering/unit/test_render_pass.cpp +++ b/tests/Rendering/unit/test_render_pass.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/tests/Rendering/unit/test_render_scene_extractor.cpp b/tests/Rendering/unit/test_render_scene_extractor.cpp index 799347a2..32762210 100644 --- a/tests/Rendering/unit/test_render_scene_extractor.cpp +++ b/tests/Rendering/unit/test_render_scene_extractor.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/Rendering/unit/test_render_scene_utility.cpp b/tests/Rendering/unit/test_render_scene_utility.cpp index ad8c9594..bbe19193 100644 --- a/tests/Rendering/unit/test_render_scene_utility.cpp +++ b/tests/Rendering/unit/test_render_scene_utility.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include diff --git a/tests/Scene/test_scene.cpp b/tests/Scene/test_scene.cpp index b3f1f45e..112cdf8e 100644 --- a/tests/Scene/test_scene.cpp +++ b/tests/Scene/test_scene.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include