From e9c3961aa5d2107b1431be348814bbe4ac9ab599 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sun, 15 Jun 2025 22:59:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inc/hgl/WorkObject.h | 12 +++++++++++- src/SceneGraph/RenderFramework.cpp | 8 ++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/inc/hgl/WorkObject.h b/inc/hgl/WorkObject.h index 741bccf7..0c404c62 100644 --- a/inc/hgl/WorkObject.h +++ b/inc/hgl/WorkObject.h @@ -83,10 +83,20 @@ namespace hgl WO_FUNC_FROM_RENDER_FRAMEWORK(CreatePipeline,graph::Pipeline *) WO_FUNC_FROM_RENDER_FRAMEWORK(CreateMaterialInstance,graph::MaterialInstance *) WO_FUNC_FROM_RENDER_FRAMEWORK(GetPrimitiveCreater,SharedPtr) - WO_FUNC_FROM_RENDER_FRAMEWORK(CreatePrimitive,graph::Primitive *) + //WO_FUNC_FROM_RENDER_FRAMEWORK(CreatePrimitive,graph::Primitive *) WO_FUNC_FROM_RENDER_FRAMEWORK(CreateMesh,graph::Mesh *) #undef WO_FUNC_FROM_RENDER_FRAMEWORK + + + graph::Primitive *CreatePrimitive(const AnsiString &name, + const uint32_t vertices_count, + const graph::VIL *vil, + const std::initializer_list &vad_list) + { + return render_framework?render_framework->CreatePrimitive(name,vertices_count,vil,vad_list):nullptr; + } + public: //Component 相关 template diff --git a/src/SceneGraph/RenderFramework.cpp b/src/SceneGraph/RenderFramework.cpp index 06c1e2ee..d090763a 100644 --- a/src/SceneGraph/RenderFramework.cpp +++ b/src/SceneGraph/RenderFramework.cpp @@ -196,10 +196,10 @@ void RenderFramework::Tick() } } -graph::Primitive *RenderFramework::CreatePrimitive(const AnsiString &name, - const uint32_t vertices_count, - const graph::VIL *vil, - const std::initializer_list &vad_list) +graph::Primitive *RenderFramework::CreatePrimitive( const AnsiString &name, + const uint32_t vertices_count, + const graph::VIL *vil, + const std::initializer_list &vad_list) { auto *pc=new graph::PrimitiveCreater(GetDevice(),vil);