From 0dae30fa06b39050cde9df2b7d7460b25424056f Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Tue, 21 Mar 2023 14:37:51 +0800 Subject: [PATCH] updated first_triangle.cpp --- CMSceneGraph | 2 +- example/Vulkan/first_triangle.cpp | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMSceneGraph b/CMSceneGraph index 404d0d84..af89ab16 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 404d0d8478aceb1d952cf7e3dfcf8a1fedaa5124 +Subproject commit af89ab168343de511796f400d17c6bc14836f691 diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index 5839cba3..4d1e9d29 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -99,16 +99,18 @@ private: bool InitAutoMaterial() { - MaterialCreateInfo mc("VertexColor2D",1,false); + MaterialCreateInfo mci("VertexColor2DNDC", ///<名称,随便起 + 1, ///<最终一个RT输出 + false); ///<无深度输出 //vertex部分 { - ShaderCreateInfoVertex *vsc=mc.GetVS(); + ShaderCreateInfoVertex *vsc=mci.GetVS(); - vsc->AddInput("vec2",VAN::Position); - vsc->AddInput("vec4",VAN::Color); + vsc->AddInput(VAT_VEC2,VAN::Position); + vsc->AddInput(VAT_VEC4,VAN::Color); - vsc->AddOutput("vec4","Color"); + vsc->AddOutput(VAT_VEC4,"Color"); vsc->SetShaderCodes(R"( void main() @@ -121,9 +123,9 @@ private: //fragment部分 { - ShaderCreateInfoFragment *fsc=mc.GetFS(); + ShaderCreateInfoFragment *fsc=mci.GetFS(); - fsc->AddOutput("vec4","Color"); + fsc->AddOutput(VAT_VEC4,"Color"); fsc->SetShaderCodes(R"( void main() @@ -132,12 +134,10 @@ private: })"); } - if(!mc.CreateShader()) + if(!mci.CreateShader()) return(false); - Material *m=db->CreateMaterial(&mc); - - material_instance=db->CreateMaterialInstance(m,&vil_config); + material_instance=db->CreateMaterialInstance(&mci,&vil_config); return material_instance; }