Group rendering extraction files

2026-04-05 21:53:35 +08:00
parent dc0e8b938f
commit c79274d6b4
15 changed files with 17 additions and 17 deletions
--- 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
--- a/engine/include/XCEngine/Rendering/Execution/CameraRenderer.h
+++ b/engine/include/XCEngine/Rendering/Execution/CameraRenderer.h
@@ -1,7 +1,7 @@
 #pragma once

+#include <XCEngine/Rendering/Extraction/RenderSceneExtractor.h>
 #include <XCEngine/Rendering/Planning/CameraRenderRequest.h>
-#include <XCEngine/Rendering/RenderSceneExtractor.h>
 #include <XCEngine/Rendering/RenderPass.h>
 #include <XCEngine/Rendering/RenderPipeline.h>

--- a/engine/include/XCEngine/Rendering/Extraction/RenderSceneExtractor.h
+++ b/engine/include/XCEngine/Rendering/Extraction/RenderSceneExtractor.h
--- a/engine/include/XCEngine/Rendering/Extraction/RenderSceneUtility.h
+++ b/engine/include/XCEngine/Rendering/Extraction/RenderSceneUtility.h
--- a/engine/src/Rendering/Extraction/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 <algorithm>
--- a/engine/src/Rendering/Extraction/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"
--- 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"

--- 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"
--- 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"

--- 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"
--- 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"
--- a/tests/Rendering/unit/test_render_pass.cpp
+++ b/tests/Rendering/unit/test_render_pass.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>

 #include <XCEngine/Rendering/RenderPass.h>
-#include <XCEngine/Rendering/RenderSceneExtractor.h>
+#include <XCEngine/Rendering/Extraction/RenderSceneExtractor.h>
 #include <XCEngine/Rendering/RenderSurface.h>

 #include <memory>
--- a/tests/Rendering/unit/test_render_scene_extractor.cpp
+++ b/tests/Rendering/unit/test_render_scene_extractor.cpp
@@ -12,7 +12,7 @@
 #include <XCEngine/Rendering/BuiltinPassContract.h>
 #include <XCEngine/Rendering/RenderMaterialResolve.h>
 #include <XCEngine/Rendering/RenderMaterialStateUtils.h>
-#include <XCEngine/Rendering/RenderSceneExtractor.h>
+#include <XCEngine/Rendering/Extraction/RenderSceneExtractor.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
 #include <XCEngine/Resources/Shader/Shader.h>
--- a/tests/Rendering/unit/test_render_scene_utility.cpp
+++ b/tests/Rendering/unit/test_render_scene_utility.cpp
@@ -5,7 +5,7 @@
 #include <XCEngine/Components/MeshRendererComponent.h>
 #include <XCEngine/Core/Asset/IResource.h>
 #include <XCEngine/Core/Math/Quaternion.h>
-#include <XCEngine/Rendering/RenderSceneUtility.h>
+#include <XCEngine/Rendering/Extraction/RenderSceneUtility.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
 #include <XCEngine/Scene/Scene.h>

--- a/tests/Scene/test_scene.cpp
+++ b/tests/Scene/test_scene.cpp
@@ -10,7 +10,7 @@
 #include <XCEngine/Components/TransformComponent.h>
 #include <XCEngine/Core/Asset/ResourceManager.h>
 #include <XCEngine/Core/Math/Vector3.h>
-#include <XCEngine/Rendering/RenderSceneExtractor.h>
+#include <XCEngine/Rendering/Extraction/RenderSceneExtractor.h>
 #include <XCEngine/Resources/Mesh/MeshLoader.h>
 #include <filesystem>
 #include <fstream>