diff --git a/inc/hgl/WorkObject.h b/inc/hgl/WorkObject.h index 895c547f..741bccf7 100644 --- a/inc/hgl/WorkObject.h +++ b/inc/hgl/WorkObject.h @@ -78,57 +78,15 @@ namespace hgl public: - template - graph::Pipeline *CreatePipeline(ARGS...args) - { - return renderer->GetRenderPass()->CreatePipeline(args...); - } + #define WO_FUNC_FROM_RENDER_FRAMEWORK(name,return_type) template return_type name(ARGS...args){return render_framework?render_framework->name(args...):nullptr;} - graph::MaterialInstance *CreateMaterialInstance(const AnsiString &mi_name,const graph::mtl::MaterialCreateInfo *mci,const graph::VILConfig *vil_cfg=nullptr) - { - return db->CreateMaterialInstance(mi_name,mci,vil_cfg); - } - - graph::MaterialInstance *CreateMaterialInstance(const AnsiString &mtl_name,graph::mtl::MaterialCreateConfig *mtl_cfg,const graph::VILConfig *vil_cfg=nullptr) - { - AutoDelete mci=graph::mtl::CreateMaterialCreateInfo(GetDevAttr(),mtl_name,mtl_cfg); - - return db->CreateMaterialInstance(mtl_name,mci,vil_cfg); - } - - AutoDelete GetPrimitiveCreater(graph::Material *mtl) - { - if(!mtl) - return(nullptr); - - return(new graph::PrimitiveCreater(GetDevice(),mtl->GetDefaultVIL())); - } - - AutoDelete GetPrimitiveCreater(graph::MaterialInstance *mi) - { - if(!mi) - return(nullptr); - - return(new graph::PrimitiveCreater(GetDevice(),mi->GetVIL())); - } - - 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; //创建Primitive - } - - graph::Mesh *CreateMesh(const AnsiString &name, - const uint32_t vertices_count, - graph::MaterialInstance *mi, - graph::Pipeline *pipeline, - const std::initializer_list &vad_list) - { - return render_framework?render_framework->CreateMesh(name,vertices_count,mi,pipeline,vad_list):nullptr; //创建Mesh - } + 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(CreateMesh,graph::Mesh *) + #undef WO_FUNC_FROM_RENDER_FRAMEWORK public: //Component 相关 template diff --git a/inc/hgl/graph/RenderFramework.h b/inc/hgl/graph/RenderFramework.h index 0ff8c38d..aa943b1e 100644 --- a/inc/hgl/graph/RenderFramework.h +++ b/inc/hgl/graph/RenderFramework.h @@ -7,6 +7,9 @@ #include #include #include +#include +#include +#include #include VK_NAMESPACE_BEGIN @@ -93,6 +96,8 @@ public: CameraControl * GetDefaultCameraControl (){return default_camera_control;} Renderer * GetDefaultRenderer (){return default_renderer;} + RenderPass * GetDefaultRenderPass (){return default_renderer->GetRenderPass();} + public: bool GetMouseCoord(Vector2i *mc)const @@ -130,6 +135,42 @@ public: // other TileFont *CreateTileFont(FontSource *fs,int limit_count=-1); ///<创建只使用一种字符的Tile字符管理对象 +public: + + template + graph::Pipeline *CreatePipeline(ARGS...args) + { + return GetDefaultRenderPass()->CreatePipeline(args...); + } + + graph::MaterialInstance *CreateMaterialInstance(const AnsiString &mi_name,const graph::mtl::MaterialCreateInfo *mci,const graph::VILConfig *vil_cfg=nullptr) + { + return render_resource->CreateMaterialInstance(mi_name,mci,vil_cfg); + } + + graph::MaterialInstance *CreateMaterialInstance(const AnsiString &mtl_name,graph::mtl::MaterialCreateConfig *mtl_cfg,const graph::VILConfig *vil_cfg=nullptr) + { + AutoDelete mci=graph::mtl::CreateMaterialCreateInfo(GetDevAttr(),mtl_name,mtl_cfg); + + return render_resource->CreateMaterialInstance(mtl_name,mci,vil_cfg); + } + + SharedPtr GetPrimitiveCreater(graph::Material *mtl) + { + if(!mtl) + return(nullptr); + + return(new graph::PrimitiveCreater(GetDevice(),mtl->GetDefaultVIL())); + } + + SharedPtr GetPrimitiveCreater(graph::MaterialInstance *mi) + { + if(!mi) + return(nullptr); + + return(new graph::PrimitiveCreater(GetDevice(),mi->GetVIL())); + } + public: // Primitive, Mesh graph::Primitive *CreatePrimitive(const AnsiString &name,