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

Group rendering material helpers

Browse Source
This commit is contained in:
ssdfasd
2026-04-05 22:14:17 +08:00
parent 5ae1b03a9e
commit 1908e81e5c
10 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/CMakeLists.txt
View File

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

0
engine/include/XCEngine/Rendering/RenderMaterialResolve.h → engine/include/XCEngine/Rendering/Materials/RenderMaterialResolve.h
View File

0
engine/include/XCEngine/Rendering/RenderMaterialStateUtils.h → engine/include/XCEngine/Rendering/Materials/RenderMaterialStateUtils.h
View File

2
engine/include/XCEngine/Rendering/Passes/BuiltinDepthStylePassBase.h
View File

@@ -4,7 +4,7 @@
#include <XCEngine/Core/Math/Matrix4.h>
#include <XCEngine/Rendering/Builtin/BuiltinPassTypes.h>
#include <XCEngine/Rendering/RenderPass.h>
#include <XCEngine/Rendering/RenderMaterialStateUtils.h>
#include <XCEngine/Rendering/Materials/RenderMaterialStateUtils.h>
#include <XCEngine/Rendering/Caches/RenderResourceCache.h>
#include <XCEngine/RHI/RHIDescriptorPool.h>
#include <XCEngine/RHI/RHIDescriptorSet.h>

4
engine/include/XCEngine/Rendering/Pipelines/BuiltinForwardPipeline.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include <XCEngine/Rendering/Builtin/BuiltinPassTypes.h>
#include <XCEngine/Rendering/RenderMaterialResolve.h>
#include <XCEngine/Rendering/RenderMaterialStateUtils.h>
#include <XCEngine/Rendering/Materials/RenderMaterialResolve.h>
#include <XCEngine/Rendering/Materials/RenderMaterialStateUtils.h>
#include <XCEngine/Rendering/RenderPass.h>
#include <XCEngine/Rendering/RenderPipeline.h>
#include <XCEngine/Rendering/RenderPipelineAsset.h>

2
engine/src/Rendering/Extraction/RenderSceneUtility.cpp
View File

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

2
engine/src/Rendering/Passes/BuiltinDepthStylePassBaseResources.cpp
View File

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

18
engine/src/Rendering/Pipelines/BuiltinForwardPipeline.cpp
View File

@@ -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() {

4
engine/src/Rendering/Pipelines/BuiltinForwardPipelineResources.cpp
View File

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

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

@@ -10,8 +10,8 @@
#include <XCEngine/Core/Math/Quaternion.h>
#include <XCEngine/Core/Math/Vector3.h>
#include <XCEngine/Rendering/Builtin/BuiltinPassContract.h>
#include <XCEngine/Rendering/RenderMaterialResolve.h>
#include <XCEngine/Rendering/RenderMaterialStateUtils.h>
#include <XCEngine/Rendering/Materials/RenderMaterialResolve.h>
#include <XCEngine/Rendering/Materials/RenderMaterialStateUtils.h>
#include <XCEngine/Rendering/Extraction/RenderSceneExtractor.h>
#include <XCEngine/Resources/Material/Material.h>
#include <XCEngine/Resources/Mesh/Mesh.h>