diff --git a/example/Basic/rf_test.cpp b/example/Basic/rf_test.cpp index d22683ea..9b67121e 100644 --- a/example/Basic/rf_test.cpp +++ b/example/Basic/rf_test.cpp @@ -48,7 +48,7 @@ private: AutoDelete mci=mtl::CreateVertexColor2D(&cfg); - material_instance=db->CreateMaterialInstance(mci); + material_instance=CreateMaterialInstance(mci); return material_instance; } diff --git a/inc/hgl/WorkObject.h b/inc/hgl/WorkObject.h index 0805f5b4..ad8324eb 100644 --- a/inc/hgl/WorkObject.h +++ b/inc/hgl/WorkObject.h @@ -1,11 +1,17 @@ #pragma once #include #include +#include #include //#include namespace hgl { + namespace graph::mtl + { + class MaterialCreateInfo; + } + /** * 工作对象

* @@ -61,6 +67,11 @@ namespace hgl return render_pass->CreatePipeline(args...); } + graph::MaterialInstance *CreateMaterialInstance(const graph::mtl::MaterialCreateInfo *mci,const graph::VILConfig *vil_cfg=nullptr) + { + return db->CreateMaterialInstance(mci,vil_cfg); + } + graph::Renderable *CreateRenderable( const AnsiString &name, uint32_t vertices_count, graph::MaterialInstance *mi, diff --git a/res b/res index 475d8ad4..fe8fcabe 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit 475d8ad43ceee084cd24f5d0bed59de9f6aa36fd +Subproject commit fe8fcabeb54f7a5b23f38260e6e09bbdcf015b7f