xuanchi/XCEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Group rendering execution and planning files

Browse Source
This commit is contained in:
ssdfasd
2026-04-05 21:33:58 +08:00
parent 7812b92992
commit 578f5dd99c
29 changed files with 41 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/src/Viewport/ViewportHostRenderFlowUtils.h
View File

@@ -5,7 +5,7 @@
#include "ViewportHostRenderTargets.h"
#include <XCEngine/Core/Math/Color.h>
#include <XCEngine/Rendering/CameraRenderRequest.h>
#include <XCEngine/Rendering/Planning/CameraRenderRequest.h>
#include <string>
#include <vector>

2
editor/src/Viewport/ViewportHostService.h
View File

@@ -23,9 +23,9 @@
#include <XCEngine/RHI/RHIEnums.h>
#include <XCEngine/RHI/RHIResourceView.h>
#include <XCEngine/RHI/RHITexture.h>
#include <XCEngine/Rendering/Execution/SceneRenderer.h>
#include <XCEngine/Rendering/RenderContext.h>
#include <XCEngine/Rendering/RenderSurface.h>
#include <XCEngine/Rendering/SceneRenderer.h>
#include <XCEngine/Scene/Scene.h>
#include <array>

16
engine/CMakeLists.txt
View File

@@ -428,14 +428,18 @@ add_library(XCEngine STATIC
# Rendering
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderContext.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/CameraRenderRequest.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/BuiltinPassTypes.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/BuiltinPassMetadataUtils.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/BuiltinPassLayoutUtils.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/BuiltinPassContract.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Execution/CameraRenderer.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Execution/SceneRenderer.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/FrameData/RenderCameraData.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/FrameData/RenderSceneData.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/FrameData/VisibleRenderItem.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Planning/CameraRenderRequest.h
${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/RenderMaterialResolve.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderMaterialStateUtils.h
@@ -446,11 +450,7 @@ add_library(XCEngine STATIC
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderPipelineAsset.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderSurface.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderResourceCache.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/CameraRenderer.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/DirectionalShadowSurfaceCache.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/SceneRenderRequestPlanner.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/SceneRenderRequestUtils.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/SceneRenderer.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Passes/BuiltinDepthOnlyPass.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Passes/BuiltinShadowCasterPass.h
@@ -458,7 +458,7 @@ add_library(XCEngine STATIC
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Passes/BuiltinInfiniteGridPass.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Passes/BuiltinObjectIdOutlinePass.h
${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/CameraRenderer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Execution/CameraRenderer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/DirectionalShadowSurfaceCache.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Passes/BuiltinDepthStylePassBase.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp
@@ -472,8 +472,8 @@ add_library(XCEngine STATIC
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/RenderSceneExtractor.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/RenderSceneUtility.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/RenderResourceCache.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/SceneRenderRequestPlanner.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/SceneRenderer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Planning/SceneRenderRequestPlanner.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Execution/SceneRenderer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Pipelines/BuiltinForwardPipeline.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp

2
engine/include/XCEngine/Rendering/CameraRenderer.h → engine/include/XCEngine/Rendering/Execution/CameraRenderer.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include <XCEngine/Rendering/CameraRenderRequest.h>
#include <XCEngine/Rendering/Planning/CameraRenderRequest.h>
#include <XCEngine/Rendering/RenderSceneExtractor.h>
#include <XCEngine/Rendering/RenderPass.h>
#include <XCEngine/Rendering/RenderPipeline.h>

6
engine/include/XCEngine/Rendering/SceneRenderer.h → engine/include/XCEngine/Rendering/Execution/SceneRenderer.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include <XCEngine/Rendering/CameraRenderRequest.h>
#include <XCEngine/Rendering/CameraRenderer.h>
#include <XCEngine/Rendering/SceneRenderRequestPlanner.h>
#include <XCEngine/Rendering/Execution/CameraRenderer.h>
#include <XCEngine/Rendering/Planning/CameraRenderRequest.h>
#include <XCEngine/Rendering/Planning/SceneRenderRequestPlanner.h>
#include <vector>

0
engine/include/XCEngine/Rendering/CameraRenderRequest.h → engine/include/XCEngine/Rendering/Planning/CameraRenderRequest.h
View File

2
engine/include/XCEngine/Rendering/SceneRenderRequestPlanner.h → engine/include/XCEngine/Rendering/Planning/SceneRenderRequestPlanner.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include <XCEngine/Rendering/CameraRenderRequest.h>
#include <XCEngine/Rendering/Planning/CameraRenderRequest.h>
#include <vector>

2
engine/include/XCEngine/Rendering/SceneRenderRequestUtils.h → engine/include/XCEngine/Rendering/Planning/SceneRenderRequestUtils.h
View File

@@ -2,7 +2,7 @@
#include <XCEngine/Components/CameraComponent.h>
#include <XCEngine/Components/GameObject.h>
#include <XCEngine/Rendering/CameraRenderRequest.h>
#include <XCEngine/Rendering/Planning/CameraRenderRequest.h>
#include <algorithm>
#include <cmath>

2
engine/src/Rendering/DirectionalShadowSurfaceCache.cpp
View File

@@ -1,6 +1,6 @@
#include "Rendering/DirectionalShadowSurfaceCache.h"
#include "Rendering/CameraRenderRequest.h"
#include "Rendering/Planning/CameraRenderRequest.h"
#include "RHI/RHIDevice.h"
#include "RHI/RHIResourceView.h"
#include "RHI/RHITexture.h"

2
engine/src/Rendering/CameraRenderer.cpp → engine/src/Rendering/Execution/CameraRenderer.cpp
View File

@@ -1,4 +1,4 @@
#include "Rendering/CameraRenderer.h"
#include "Rendering/Execution/CameraRenderer.h"
#include "Rendering/DirectionalShadowSurfaceCache.h"
#include "Rendering/Passes/BuiltinDepthOnlyPass.h"

4
engine/src/Rendering/SceneRenderer.cpp → engine/src/Rendering/Execution/SceneRenderer.cpp
View File

@@ -1,5 +1,5 @@
#include "Rendering/SceneRenderer.h"
#include "Rendering/SceneRenderRequestUtils.h"
#include "Rendering/Execution/SceneRenderer.h"
#include "Rendering/Planning/SceneRenderRequestUtils.h"
namespace XCEngine {
namespace Rendering {

4
engine/src/Rendering/SceneRenderRequestPlanner.cpp → engine/src/Rendering/Planning/SceneRenderRequestPlanner.cpp
View File

@@ -1,4 +1,4 @@
#include "Rendering/SceneRenderRequestPlanner.h"
#include "Rendering/Planning/SceneRenderRequestPlanner.h"
#include "Components/GameObject.h"
#include "Components/LightComponent.h"
@@ -7,7 +7,7 @@
#include "Core/Math/Matrix4.h"
#include "Core/Math/Quaternion.h"
#include "Rendering/RenderSceneUtility.h"
#include "Rendering/SceneRenderRequestUtils.h"
#include "Rendering/Planning/SceneRenderRequestUtils.h"
#include "Scene/Scene.h"

8
tests/Rendering/integration/backpack_lit_scene/main.cpp
View File

@@ -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;
}

8
tests/Rendering/integration/backpack_scene/main.cpp
View File

@@ -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;
}

8
tests/Rendering/integration/camera_stack_scene/main.cpp
View File

@@ -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;
}

2
tests/Rendering/integration/cull_material_scene/main.cpp
View File

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

2
tests/Rendering/integration/depth_sort_scene/main.cpp
View File

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

2
tests/Rendering/integration/directional_shadow_scene/main.cpp
View File

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

2
tests/Rendering/integration/material_state_scene/main.cpp
View File

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

2
tests/Rendering/integration/multi_light_scene/main.cpp
View File

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

4
tests/Rendering/integration/object_id_scene/main.cpp
View File

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

2
tests/Rendering/integration/offscreen_scene/main.cpp
View File

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

2
tests/Rendering/integration/spot_light_scene/main.cpp
View File

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

2
tests/Rendering/integration/textured_quad_scene/main.cpp
View File

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

2
tests/Rendering/integration/transparent_material_scene/main.cpp
View File

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

2
tests/Rendering/integration/unlit_scene/main.cpp
View File

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

4
tests/Rendering/unit/test_camera_scene_renderer.cpp
View File

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

2
tests/Rendering/unit/test_scene_render_request_planner.cpp
View File

@@ -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;

2
tests/Rendering/unit/test_scene_render_request_utils.cpp
View File

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