added to init 2d gizmo resource.

example/Gizmo/GizmoResource.cpp

@@ -14,25 +14,6 @@ VK_NAMESPACE_BEGIN
 
 namespace
 {
-    static Color4f GizmoColorRGB[size_t(GizmoColor::RANGE_SIZE)];
-
-    static RenderResource *    gizmo_rr                 =nullptr;
-
-    static Material *           gizmo_mtl_line          =nullptr;
-    static MaterialInstance *   gizmo_mi_line           =nullptr;
-    static Pipeline *           gizmo_pipeline_line     =nullptr;
-
-    static Material *          gizmo_mtl_triangles      =nullptr;
-    static MaterialInstance *  gizmo_mi_triangles[size_t(GizmoColor::RANGE_SIZE)]{};
-    static Pipeline *          gizmo_pipeline_triangles =nullptr;
-    static VertexDataManager * gizmo_vdm_triangles      =nullptr;
-
-    static PrimitiveCreater *  gizmo_prim_creater       =nullptr;
-
-    static Primitive *         gizmo_prim[size_t(GizmoShape::RANGE_SIZE)]{};
-
-    bool InitGizmoMI()
-    {
     constexpr const COLOR gizmo_color[size_t(GizmoColor::RANGE_SIZE)]=
     {
         COLOR::MozillaCharcoal,
@@ -45,7 +26,28 @@ namespace
         COLOR::BlenderYellow,
     };
 
-        if(!gizmo_rr||!gizmo_mtl_triangles)
+    static Color4f GizmoColorRGB[size_t(GizmoColor::RANGE_SIZE)];
+
+    static RenderResource *     gizmo_rr                =nullptr;
+
+    struct GizmoResource
+    {
+        Material *           mtl;
+        MaterialInstance *   mi[size_t(GizmoColor::RANGE_SIZE)];
+        Pipeline *           pipeline;
+        VertexDataManager *  vdm;
+
+        PrimitiveCreater *   prim_creater;
+    };
+
+    GizmoResource gr_line{};
+    GizmoResource gr_triangle{};
+
+    static Primitive *          gizmo_prim[size_t(GizmoShape::RANGE_SIZE)]{};
+
+    bool InitMI(GizmoResource *gr)
+    {
+        if(!gr||!gr->mtl)
             return(false);
 
         Color4f color;
@@ -54,19 +56,67 @@ namespace
         {
             color=GetColor4f(gizmo_color[i],1.0);
 
-            gizmo_mi_triangles[i]=gizmo_rr->CreateMaterialInstance(gizmo_mtl_triangles,nullptr,&color);
+            gr->mi[i]=gizmo_rr->CreateMaterialInstance(gr->mtl,nullptr,&color);
-            if(!gizmo_mi_triangles[i])
+            if(!gr->mi[i])
                 return(false);
         }
 
         return(true);
     }
-}//namespace
 
-bool InitGizmoResource(GPUDevice *device)
+    bool InitGizmoResource2D(GPUDevice *device)
-{
+    {
-    gizmo_rr=new RenderResource(device);
+        if(!gizmo_rr)
+            return(false);
 
+        RenderPass *render_pass=device->GetRenderPass();
+        
+        {
+            mtl::Material3DCreateConfig cfg(device->GetDeviceAttribute(),"VertexLuminance3D",Prim::Lines);
+
+            cfg.mtl_name="VertexLuminance3D";       //注意必须用不同名字，未来改名材质文件名+cfg hash名
+            cfg.position_format=VAT_VEC3;
+
+            mtl::MaterialCreateInfo *mci=CreateVertexLuminance3D(&cfg);
+
+            if(!mci)
+                return(false);
+
+            gr_line.mtl=gizmo_rr->CreateMaterial(mci);
+            if(!gr_line.mtl)
+                return(false);
+        }
+
+        {
+            gr_line.pipeline=render_pass->CreatePipeline(gr_line.mtl,InlinePipeline::Solid3D,Prim::Lines);
+
+            if(!gr_line.pipeline)
+                return(false);
+        }
+
+        if(!InitMI(&gr_line))
+            return(false);
+        
+        {
+            gr_line.vdm=new VertexDataManager(device,gr_line.mtl->GetDefaultVIL());
+
+            if(!gr_line.vdm)
+                return(false);
+
+            if(!gr_line.vdm->Init(  HGL_SIZE_1MB,       //最大顶点数量
+                                    HGL_SIZE_1MB,       //最大索引数量
+                                    IndexType::U16))    //索引类型
+                return(false);
+        }
+
+        {
+        }
+
+        return(true);
+    }
+
+    bool InitGizmoResource3D(GPUDevice *device)
+    {
         if(!gizmo_rr)
             return(false);
 
@@ -83,36 +133,36 @@ bool InitGizmoResource(GPUDevice *device)
             if(!mci)
                 return(false);
 
-        gizmo_mtl_triangles=gizmo_rr->CreateMaterial(mci);
+            gr_triangle.mtl=gizmo_rr->CreateMaterial(mci);
-        if(!gizmo_mtl_triangles)
+            if(!gr_triangle.mtl)
-            return(false);
-    }
-
-    if(!InitGizmoMI())
-        return(false);
-
-    {
-        gizmo_pipeline_triangles=render_pass->CreatePipeline(gizmo_mtl_triangles,InlinePipeline::Solid3D,Prim::Triangles);
-        if(!gizmo_pipeline_triangles)
                 return(false);
         }
 
         {
-        gizmo_vdm_triangles=new VertexDataManager(device,gizmo_mtl_triangles->GetDefaultVIL());
+            gr_triangle.pipeline=render_pass->CreatePipeline(gr_triangle.mtl,InlinePipeline::Solid3D,Prim::Triangles);
+            if(!gr_triangle.pipeline)
+                return(false);
+        }
 
-        if(!gizmo_vdm_triangles)
+        if(!InitMI(&gr_triangle))
             return(false);
 
-        if(!gizmo_vdm_triangles->Init(HGL_SIZE_1MB,       //最大顶点数量
+        {
+            gr_triangle.vdm=new VertexDataManager(device,gr_triangle.mtl->GetDefaultVIL());
+
+            if(!gr_triangle.vdm)
+                return(false);
+
+            if(!gr_triangle.vdm->Init(  HGL_SIZE_1MB,       //最大顶点数量
                                         HGL_SIZE_1MB,       //最大索引数量
                                         IndexType::U16))    //索引类型
                 return(false);
         }
 
         {
-        gizmo_prim_creater=new PrimitiveCreater(gizmo_vdm_triangles);
+            gr_triangle.prim_creater=new PrimitiveCreater(gr_triangle.vdm);
 
-        if(!gizmo_prim_creater)
+            if(!gr_triangle.prim_creater)
                 return(false);
         }
 
@@ -120,7 +170,7 @@ bool InitGizmoResource(GPUDevice *device)
             using namespace inline_geometry;
 
             {
-            gizmo_prim[size_t(GizmoShape::Plane)]=CreatePlane(gizmo_prim_creater);
+                gizmo_prim[size_t(GizmoShape::Plane)]=CreatePlane(gr_triangle.prim_creater);
             }
 
             {
@@ -130,11 +180,11 @@ bool InitGizmoResource(GPUDevice *device)
                 cci.tangent=false;
                 cci.tex_coord=false;
 
-            gizmo_prim[size_t(GizmoShape::Cube)]=CreateCube(gizmo_prim_creater,&cci);
+                gizmo_prim[size_t(GizmoShape::Cube)]=CreateCube(gr_triangle.prim_creater,&cci);
             }
 
             {
-            gizmo_prim[size_t(GizmoShape::Sphere)]=CreateSphere(gizmo_prim_creater,8);
+                gizmo_prim[size_t(GizmoShape::Sphere)]=CreateSphere(gr_triangle.prim_creater,8);
             }
 
             {
@@ -145,7 +195,7 @@ bool InitGizmoResource(GPUDevice *device)
                 cci.numberSlices=8;         //圆锥底部分割数
                 cci.numberStacks=1;         //圆锥高度分割数
 
-            gizmo_prim[size_t(GizmoShape::Cone)]=CreateCone(gizmo_prim_creater,&cci);
+                gizmo_prim[size_t(GizmoShape::Cone)]=CreateCone(gr_triangle.prim_creater,&cci);
             }
 
             {
@@ -155,7 +205,7 @@ bool InitGizmoResource(GPUDevice *device)
                 cci.numberSlices=8;         //圆柱底部分割数
                 cci.radius      =1;         //圆柱半径
 
-            gizmo_prim[size_t(GizmoShape::Cylinder)]=CreateCylinder(gizmo_prim_creater,&cci);
+                gizmo_prim[size_t(GizmoShape::Cylinder)]=CreateCylinder(gr_triangle.prim_creater,&cci);
             }
 
             ENUM_CLASS_FOR(GizmoShape,int,i)
@@ -165,14 +215,31 @@ bool InitGizmoResource(GPUDevice *device)
             }
         }
 
+        return(true);
+    }
+}//namespace
+
+bool InitGizmoResource(GPUDevice *device)
+{
+    if(gizmo_rr)
+        return(false);
+
+    gizmo_rr=new RenderResource(device);
+
+    if(!InitGizmoResource3D(device))
+        return(false);
+
+    if(!InitGizmoResource2D(device))
+        return(false);
+
     return(true);
 }
 
 void FreeGizmoResource()
 {
     SAFE_CLEAR_OBJECT_ARRAY(gizmo_prim)
-    SAFE_CLEAR(gizmo_prim_creater);
+    SAFE_CLEAR(gr_triangle.prim_creater);
-    SAFE_CLEAR(gizmo_vdm_triangles);
+    SAFE_CLEAR(gr_triangle.vdm);
 //    SAFE_CLEAR(gizmo_pipeline_triangles);
 //    SAFE_CLEAR_OBJECT_ARRAY(gizmo_mi_triangles)
     //SAFE_CLEAR(gizmo_mtl_triangles);