Group rendering execution and planning files

2026-04-05 21:33:58 +08:00
parent 7812b92992
commit 578f5dd99c
29 changed files with 41 additions and 59 deletions
--- a/tests/Rendering/integration/backpack_lit_scene/main.cpp
+++ b/tests/Rendering/integration/backpack_lit_scene/main.cpp
@@ -17,7 +17,7 @@
 #include <XCEngine/Debug/Logger.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
 #include <XCEngine/Resources/Mesh/MeshImportSettings.h>
 #include <XCEngine/Resources/Mesh/MeshLoader.h>
@@ -156,12 +156,6 @@ void BackpackLitSceneTest::TearDown() {
    mScene.reset();

    if (mMesh != nullptr) {
-        for (size_t materialIndex = 0; materialIndex < mMesh->GetMaterials().Size(); ++materialIndex) {
-            delete mMesh->GetMaterials()[materialIndex];
-        }
-        for (size_t textureIndex = 0; textureIndex < mMesh->GetTextures().Size(); ++textureIndex) {
-            delete mMesh->GetTextures()[textureIndex];
-        }
        delete mMesh;
        mMesh = nullptr;
    }
--- a/tests/Rendering/integration/backpack_scene/main.cpp
+++ b/tests/Rendering/integration/backpack_scene/main.cpp
@@ -16,7 +16,7 @@
 #include <XCEngine/Debug/Logger.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
 #include <XCEngine/Resources/Mesh/MeshImportSettings.h>
@@ -157,12 +157,6 @@ void BackpackSceneTest::TearDown() {
    mScene.reset();

    if (mMesh != nullptr) {
-        for (size_t materialIndex = 0; materialIndex < mMesh->GetMaterials().Size(); ++materialIndex) {
-            delete mMesh->GetMaterials()[materialIndex];
-        }
-        for (size_t textureIndex = 0; textureIndex < mMesh->GetTextures().Size(); ++textureIndex) {
-            delete mMesh->GetTextures()[textureIndex];
-        }
        delete mMesh;
        mMesh = nullptr;
    }
--- a/tests/Rendering/integration/camera_stack_scene/main.cpp
+++ b/tests/Rendering/integration/camera_stack_scene/main.cpp
@@ -18,7 +18,7 @@
 #include <XCEngine/Debug/Logger.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
 #include <XCEngine/Resources/Mesh/MeshImportSettings.h>
@@ -249,12 +249,6 @@ void CameraStackSceneTest::TearDown() {
    mQuadMesh = nullptr;

    if (mBackpackMesh != nullptr) {
-        for (size_t materialIndex = 0; materialIndex < mBackpackMesh->GetMaterials().Size(); ++materialIndex) {
-            delete mBackpackMesh->GetMaterials()[materialIndex];
-        }
-        for (size_t textureIndex = 0; textureIndex < mBackpackMesh->GetTextures().Size(); ++textureIndex) {
-            delete mBackpackMesh->GetTextures()[textureIndex];
-        }
        delete mBackpackMesh;
        mBackpackMesh = nullptr;
    }
--- a/tests/Rendering/integration/cull_material_scene/main.cpp
+++ b/tests/Rendering/integration/cull_material_scene/main.cpp
@@ -15,7 +15,7 @@
 #include <XCEngine/Debug/Logger.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
 #include <XCEngine/Resources/Texture/Texture.h>
--- a/tests/Rendering/integration/depth_sort_scene/main.cpp
+++ b/tests/Rendering/integration/depth_sort_scene/main.cpp
@@ -15,7 +15,7 @@
 #include <XCEngine/Debug/Logger.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
 #include <XCEngine/Resources/Texture/Texture.h>
--- a/tests/Rendering/integration/directional_shadow_scene/main.cpp
+++ b/tests/Rendering/integration/directional_shadow_scene/main.cpp
@@ -20,7 +20,7 @@
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderPass.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/BuiltinResources.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
--- a/tests/Rendering/integration/material_state_scene/main.cpp
+++ b/tests/Rendering/integration/material_state_scene/main.cpp
@@ -15,7 +15,7 @@
 #include <XCEngine/Debug/Logger.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
 #include <XCEngine/Resources/Texture/Texture.h>
--- a/tests/Rendering/integration/multi_light_scene/main.cpp
+++ b/tests/Rendering/integration/multi_light_scene/main.cpp
@@ -18,7 +18,7 @@
 #include <XCEngine/Core/Math/Vector3.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/BuiltinResources.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
--- a/tests/Rendering/integration/object_id_scene/main.cpp
+++ b/tests/Rendering/integration/object_id_scene/main.cpp
@@ -12,8 +12,8 @@
 #include <XCEngine/Core/Math/Vector3.h>
 #include <XCEngine/Debug/ConsoleLogSink.h>
 #include <XCEngine/Debug/Logger.h>
-#include <XCEngine/Rendering/CameraRenderRequest.h>
-#include <XCEngine/Rendering/CameraRenderer.h>
+#include <XCEngine/Rendering/Execution/CameraRenderer.h>
+#include <XCEngine/Rendering/Planning/CameraRenderRequest.h>
 #include <XCEngine/Rendering/Picking/ObjectIdCodec.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
--- a/tests/Rendering/integration/offscreen_scene/main.cpp
+++ b/tests/Rendering/integration/offscreen_scene/main.cpp
@@ -15,7 +15,7 @@
 #include <XCEngine/Debug/Logger.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
 #include <XCEngine/Resources/Texture/Texture.h>
--- a/tests/Rendering/integration/spot_light_scene/main.cpp
+++ b/tests/Rendering/integration/spot_light_scene/main.cpp
@@ -18,7 +18,7 @@
 #include <XCEngine/Core/Math/Vector3.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/BuiltinResources.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
--- a/tests/Rendering/integration/textured_quad_scene/main.cpp
+++ b/tests/Rendering/integration/textured_quad_scene/main.cpp
@@ -14,7 +14,7 @@
 #include <XCEngine/Debug/Logger.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
 #include <XCEngine/Resources/Texture/Texture.h>
--- a/tests/Rendering/integration/transparent_material_scene/main.cpp
+++ b/tests/Rendering/integration/transparent_material_scene/main.cpp
@@ -15,7 +15,7 @@
 #include <XCEngine/Debug/Logger.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
 #include <XCEngine/Resources/Texture/Texture.h>
--- a/tests/Rendering/integration/unlit_scene/main.cpp
+++ b/tests/Rendering/integration/unlit_scene/main.cpp
@@ -14,7 +14,7 @@
 #include <XCEngine/Debug/Logger.h>
 #include <XCEngine/Rendering/RenderContext.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Resources/BuiltinResources.h>
 #include <XCEngine/Resources/Material/Material.h>
 #include <XCEngine/Resources/Mesh/Mesh.h>
--- a/tests/Rendering/unit/test_camera_scene_renderer.cpp
+++ b/tests/Rendering/unit/test_camera_scene_renderer.cpp
@@ -7,10 +7,10 @@
 #include <XCEngine/RHI/RHIResourceView.h>
 #include <XCEngine/RHI/RHITexture.h>
 #include <XCEngine/Core/Math/Vector4.h>
-#include <XCEngine/Rendering/CameraRenderer.h>
+#include <XCEngine/Rendering/Execution/CameraRenderer.h>
 #include <XCEngine/Rendering/RenderPipelineAsset.h>
 #include <XCEngine/Rendering/RenderSurface.h>
-#include <XCEngine/Rendering/SceneRenderer.h>
+#include <XCEngine/Rendering/Execution/SceneRenderer.h>
 #include <XCEngine/Scene/Scene.h>

 #include <memory>
--- a/tests/Rendering/unit/test_scene_render_request_planner.cpp
+++ b/tests/Rendering/unit/test_scene_render_request_planner.cpp
@@ -2,7 +2,7 @@

 #include <XCEngine/Components/CameraComponent.h>
 #include <XCEngine/Components/LightComponent.h>
-#include <XCEngine/Rendering/SceneRenderRequestPlanner.h>
+#include <XCEngine/Rendering/Planning/SceneRenderRequestPlanner.h>
 #include <XCEngine/Scene/Scene.h>

 using namespace XCEngine::Components;
--- a/tests/Rendering/unit/test_scene_render_request_utils.cpp
+++ b/tests/Rendering/unit/test_scene_render_request_utils.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>

 #include <XCEngine/Components/CameraComponent.h>
-#include <XCEngine/Rendering/SceneRenderRequestUtils.h>
+#include <XCEngine/Rendering/Planning/SceneRenderRequestUtils.h>
 #include <XCEngine/Scene/Scene.h>

 #include <vector>