From 1908e81e5c361ae2d19f97ef238067b897fe9252 Mon Sep 17 00:00:00 2001 From: ssdfasd <2156608475@qq.com> Date: Sun, 5 Apr 2026 22:14:17 +0800 Subject: [PATCH] Group rendering material helpers --- engine/CMakeLists.txt | 4 ++-- .../{ => Materials}/RenderMaterialResolve.h | 0 .../{ => Materials}/RenderMaterialStateUtils.h | 0 .../Passes/BuiltinDepthStylePassBase.h | 2 +- .../Pipelines/BuiltinForwardPipeline.h | 4 ++-- .../Extraction/RenderSceneUtility.cpp | 2 +- .../BuiltinDepthStylePassBaseResources.cpp | 2 +- .../Pipelines/BuiltinForwardPipeline.cpp | 18 +----------------- .../BuiltinForwardPipelineResources.cpp | 4 ++-- .../unit/test_render_scene_extractor.cpp | 4 ++-- 10 files changed, 12 insertions(+), 28 deletions(-) rename engine/include/XCEngine/Rendering/{ => Materials}/RenderMaterialResolve.h (100%) rename engine/include/XCEngine/Rendering/{ => Materials}/RenderMaterialStateUtils.h (100%) diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index ad3966d3..2569b0d2 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -443,8 +443,8 @@ add_library(XCEngine STATIC ${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/Materials/RenderMaterialResolve.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/Materials/RenderMaterialStateUtils.h ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderPass.h ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderPipeline.h ${CMAKE_CURRENT_SOURCE_DIR}/include/XCEngine/Rendering/RenderPipelineAsset.h diff --git a/engine/include/XCEngine/Rendering/RenderMaterialResolve.h b/engine/include/XCEngine/Rendering/Materials/RenderMaterialResolve.h similarity index 100% rename from engine/include/XCEngine/Rendering/RenderMaterialResolve.h rename to engine/include/XCEngine/Rendering/Materials/RenderMaterialResolve.h diff --git a/engine/include/XCEngine/Rendering/RenderMaterialStateUtils.h b/engine/include/XCEngine/Rendering/Materials/RenderMaterialStateUtils.h similarity index 100% rename from engine/include/XCEngine/Rendering/RenderMaterialStateUtils.h rename to engine/include/XCEngine/Rendering/Materials/RenderMaterialStateUtils.h diff --git a/engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h b/engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h index 5075b45a..93c72216 100644 --- a/engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h +++ b/engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h b/engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h index 61a528f2..2bd03c6c 100644 --- a/engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h +++ b/engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h @@ -1,8 +1,8 @@ #pragma once #include -#include -#include +#include +#include #include #include #include diff --git a/engine/src/Rendering/Extraction/RenderSceneUtility.cpp b/engine/src/Rendering/Extraction/RenderSceneUtility.cpp index 27a91490..0685c289 100644 --- a/engine/src/Rendering/Extraction/RenderSceneUtility.cpp +++ b/engine/src/Rendering/Extraction/RenderSceneUtility.cpp @@ -6,7 +6,7 @@ #include "Components/MeshFilterComponent.h" #include "Components/MeshRendererComponent.h" #include "Components/TransformComponent.h" -#include "Rendering/RenderMaterialResolve.h" +#include "Rendering/Materials/RenderMaterialResolve.h" #include "Scene/Scene.h" #include diff --git a/engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp b/engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp index f9c0dfe2..68137821 100644 --- a/engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp +++ b/engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp @@ -6,7 +6,7 @@ #include "RHI/RHICommandList.h" #include "Rendering/Builtin/BuiltinPassLayoutUtils.h" #include "Rendering/Detail/ShaderVariantUtils.h" -#include "Rendering/RenderMaterialResolve.h" +#include "Rendering/Materials/RenderMaterialResolve.h" #include "Rendering/Extraction/RenderSceneExtractor.h" #include "Rendering/RenderSurface.h" #include "Resources/Material/Material.h" diff --git a/engine/src/Rendering/Pipelines/BuiltinForwardPipeline.cpp b/engine/src/Rendering/Pipelines/BuiltinForwardPipeline.cpp index fc4d084d..4f07aad2 100644 --- a/engine/src/Rendering/Pipelines/BuiltinForwardPipeline.cpp +++ b/engine/src/Rendering/Pipelines/BuiltinForwardPipeline.cpp @@ -3,7 +3,7 @@ #include "Debug/Logger.h" #include "Core/Asset/ResourceManager.h" #include "RHI/RHICommandList.h" -#include "Rendering/RenderMaterialResolve.h" +#include "Rendering/Materials/RenderMaterialResolve.h" #include "Rendering/RenderSurface.h" #include "Resources/BuiltinResources.h" @@ -49,22 +49,6 @@ bool IsDepthFormat(RHI::Format format) { format == RHI::Format::D32_Float; } -bool TryResolveSurfacePassType( - const Resources::Material* material, - BuiltinMaterialPass& outPass) { - if (MatchesBuiltinPass(material, BuiltinMaterialPass::Unlit)) { - outPass = BuiltinMaterialPass::Unlit; - return true; - } - - if (MatchesBuiltinPass(material, BuiltinMaterialPass::ForwardLit)) { - outPass = BuiltinMaterialPass::ForwardLit; - return true; - } - - return false; -} - } // namespace BuiltinForwardPipeline::BuiltinForwardPipeline() { diff --git a/engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp b/engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp index 9d4ff36a..d350c3a9 100644 --- a/engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp +++ b/engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp @@ -6,8 +6,8 @@ #include "RHI/RHIDevice.h" #include "Rendering/Builtin/BuiltinPassLayoutUtils.h" #include "Rendering/Detail/ShaderVariantUtils.h" -#include "Rendering/RenderMaterialResolve.h" -#include "Rendering/RenderMaterialStateUtils.h" +#include "Rendering/Materials/RenderMaterialResolve.h" +#include "Rendering/Materials/RenderMaterialStateUtils.h" #include "Resources/Material/Material.h" #include "Resources/Shader/Shader.h" #include "Resources/Texture/Texture.h" diff --git a/tests/Rendering/unit/test_render_scene_extractor.cpp b/tests/Rendering/unit/test_render_scene_extractor.cpp index e78efd8b..b4c02667 100644 --- a/tests/Rendering/unit/test_render_scene_extractor.cpp +++ b/tests/Rendering/unit/test_render_scene_extractor.cpp @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include