renamed to CreateMesh from CreateRenderable

example/2dVector/LerpLine.cpp

@@ -74,7 +74,7 @@ private:
         if(!rpc.WriteVAB(VAN::Position,   PositionFormat, position_data))return(false);
         if(!rpc.WriteVAB(VAN::Color,      ColorFormat,    color_data   ))return(false);
         
-        render_obj=db->CreateRenderable(&rpc,material_instance,pipeline);
+        render_obj=db->CreateMesh(&rpc,material_instance,pipeline);
         return(render_obj);
     }
 

example/2dVector/line.cpp

@@ -118,7 +118,7 @@ private:
 
         if(!primitive->Set(VAN::Position,  db->CreateVAB(VF_V2F,VERTEX_COUNT,position_data)))return(false);
         
-        render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
+        render_obj=db->CreateMesh(primitive,material_instance,pipeline);
         return(true);
     }
 

example/2dVector/roundbox.cpp

@@ -140,7 +140,7 @@ private:
 
         if(!primitive->Set(VAN::Position,  db->CreateVAB(VF_V4I16,VERTEX_COUNT,position_data)))return(false);
         
-        render_obj=db->CreateRenderable(primitive,material_instance,pipeline);
+        render_obj=db->CreateMesh(primitive,material_instance,pipeline);
         return(true);
     }
 

example/Basic/BillboardTest.cpp

@@ -112,7 +112,7 @@ private:
     
     Mesh *Add(Primitive *r,MaterialInstance *mi,Pipeline *p)
     {
-        Mesh *ri=db->CreateRenderable(r,mi,p);
+        Mesh *ri=db->CreateMesh(r,mi,p);
 
         if(!ri)
         {
@@ -151,7 +151,7 @@ private:
             if(!pc.WriteVAB(VAN::Position,VF_V3F,position_data))
                 return(false);
 
-            ro_billboard=db->CreateRenderable(&pc,mi_billboard,pipeline_billboard);
+            ro_billboard=db->CreateMesh(&pc,mi_billboard,pipeline_billboard);
             if(!ro_billboard)
                 return(false);
         }

example/Basic/auto_instance.cpp

@@ -72,7 +72,7 @@ private:
 
     bool InitVBO()
     {
-        render_obj=CreateRenderable("Triangle",VERTEX_COUNT,material_instance,pipeline,
+        render_obj=CreateMesh("Triangle",VERTEX_COUNT,material_instance,pipeline,
                                     {
                                         {VAN::Position,   VF_V2F,     position_data},
                                         {VAN::Color,      VF_V4UN8,   color_data   }

example/Basic/auto_merge_material_instance.cpp

@@ -95,7 +95,7 @@ private:
         
         for(uint i=0;i<DRAW_OBJECT_COUNT;i++)
         {
-            render_obj[i].r=db->CreateRenderable(prim,render_obj[i].mi,pipeline);
+            render_obj[i].r=db->CreateMesh(prim,render_obj[i].mi,pipeline);
 
             if(!render_obj[i].r)
                 return(false);

example/Basic/draw_triangle_in_NDC.cpp

@@ -113,7 +113,7 @@ private:
         Float32toFloat16(position_data_hf,position_data_float,VERTEX_COUNT*2);
 #endif//USE_HALF_FLOAT_POSITION
 
-        render_obj=CreateRenderable("Triangle",VERTEX_COUNT,material_instance,pipeline,
+        render_obj=CreateMesh("Triangle",VERTEX_COUNT,material_instance,pipeline,
                                     {
                                         {VAN::Position,PositionFormat,position_data},
                                         {VAN::Color,   ColorFormat,   color_data}

example/Basic/draw_triangle_use_UBO.cpp

@@ -85,7 +85,7 @@ private:
             position_data[i][1]=position_data_float[i][1]*ext.height;
         }
 
-        render_obj=CreateRenderable("Triangle",VERTEX_COUNT,material_instance,pipeline,
+        render_obj=CreateMesh("Triangle",VERTEX_COUNT,material_instance,pipeline,
                                     {
                                         {VAN::Position,POSITION_DATA_FORMAT,position_data},
                                         {VAN::Color,   COLOR_DATA_FORMAT,   color_data}

example/Basic/rf_test.cpp

@@ -61,7 +61,7 @@ private:
 
     bool InitVBO()
     {
-        render_obj=CreateRenderable("Triangle",VERTEX_COUNT,material_instance,pipeline,
+        render_obj=CreateMesh("Triangle",VERTEX_COUNT,material_instance,pipeline,
                                     {
                                         {VAN::Position,VF_V2F,position_data},
                                         {VAN::Color,   VF_V4F,color_data}

example/GUI/DrawText.cpp

@@ -44,7 +44,7 @@ private:
         if(!text_primitive)
             return(false);
 
-        render_obj=text_render->CreateRenderable(text_primitive);
+        render_obj=text_render->CreateMesh(text_primitive);
         if(!render_obj)
             return(false);
 

example/Gizmo/GizmoResource.cpp

@@ -58,7 +58,7 @@ namespace
         gr->prim=prim;
 
         for(uint i=0;i<uint(GizmoColor::RANGE_SIZE);i++)
-            gr->renderable[i]=CreateRenderable(prim,gizmo_triangle.mi[i],p);
+            gr->renderable[i]=CreateMesh(prim,gizmo_triangle.mi[i],p);
     }
 
     bool InitMI(GizmoResource *gr)

example/Gizmo/MetricCellsGrid.cpp

@@ -95,7 +95,7 @@ private:
 
     Mesh *Add(MaterialInstance *mi,const Matrix4f &mat)
     {
-        Mesh *ri=db->CreateRenderable(ro_plane,mi,pipeline);
+        Mesh *ri=db->CreateMesh(ro_plane,mi,pipeline);
 
         if(!ri)
             return(nullptr);

example/Gizmo/PlaneGrid3D.cpp

@@ -76,7 +76,7 @@ private:
 
     Mesh *Add(MaterialInstance *mi,const Matrix4f &mat)
     {
-        Mesh *ri=db->CreateRenderable(prim_plane_grid,mi,pipeline);
+        Mesh *ri=db->CreateMesh(prim_plane_grid,mi,pipeline);
 
         if(!ri)
             return(nullptr);

example/Gizmo/RayPicking.cpp

@@ -94,7 +94,7 @@ private:
     
     Mesh *Add(Primitive *r,MaterialInstance *mi,Pipeline *p)
     {
-        Mesh *ri=db->CreateRenderable(r,mi,p);
+        Mesh *ri=db->CreateMesh(r,mi,p);
 
         if(!ri)
         {

example/LightBasic/BlinnPhongDirectionLight.cpp

@@ -252,7 +252,7 @@ private:
         if(!p)
             return(nullptr);
 
-        Mesh *ri=db->CreateRenderable(r,mi,p);
+        Mesh *ri=db->CreateMesh(r,mi,p);
 
         if(!ri)
         {

example/Texture/texture_quad.cpp

@@ -92,7 +92,7 @@ private:
         if(!rpc.WriteVAB(VAN::Position,   VF_V2F, position_data))return(false);
         if(!rpc.WriteVAB(VAN::TexCoord,   VF_V2F, tex_coord_data))return(false);
 
-        render_obj=db->CreateRenderable(&rpc,material_instance,pipeline);
+        render_obj=db->CreateMesh(&rpc,material_instance,pipeline);
         return(render_obj);
     }
 

example/Texture/texture_rect.cpp

@@ -88,7 +88,7 @@ private:
         if(!rpc.WriteVAB(VAN::Position,VF_V4F,position_data))return(false);
         if(!rpc.WriteVAB(VAN::TexCoord,VF_V4F,tex_coord_data))return(false);
 
-        render_obj=db->CreateRenderable(&rpc,material_instance,pipeline);
+        render_obj=db->CreateMesh(&rpc,material_instance,pipeline);
         return(render_obj);
     }
 

example/Texture/texture_rect_array.cpp

@@ -144,7 +144,7 @@ private:
 
         for(uint32_t i=0;i<TexCount;i++)
         {
-            render_obj[i].r=db->CreateRenderable(prim_rectangle,render_obj[i].mi,pipeline);
+            render_obj[i].r=db->CreateMesh(prim_rectangle,render_obj[i].mi,pipeline);
 
             if(!render_obj[i].r)
                 return(false);

inc/hgl/WorkObject.h

@@ -91,7 +91,7 @@ namespace hgl
                                             const graph::VIL *vil,
                                             const std::initializer_list<graph::VertexAttribDataPtr> &vad_list);
 
-        graph::Mesh *CreateRenderable(const AnsiString &name,
+        graph::Mesh *CreateMesh(const AnsiString &name,
                                             const uint32_t vertices_count,
                                             graph::MaterialInstance *mi,
                                             graph::Pipeline *pipeline,

inc/hgl/graph/Mesh.h

@@ -75,7 +75,7 @@ class Mesh
 
 private:
 
-    friend Mesh *CreateRenderable(Primitive *,MaterialInstance *,Pipeline *);
+    friend Mesh *CreateMesh(Primitive *,MaterialInstance *,Pipeline *);
 
     Mesh(Primitive *,MaterialInstance *,Pipeline *,MeshDataBuffer *,MeshRenderData *);
 
@@ -116,5 +116,5 @@ public:
             }
 };//class Mesh
 
-Mesh *CreateRenderable(Primitive *,MaterialInstance *,Pipeline *);
+Mesh *CreateMesh(Primitive *,MaterialInstance *,Pipeline *);
 VK_NAMESPACE_END

inc/hgl/graph/VKRenderResource.h

@@ -143,8 +143,8 @@ public: //Material
 
     MaterialInstance *  CreateMaterialInstance(const AnsiString &mtl_name,const mtl::MaterialCreateInfo *,const VILConfig *vil_cfg=nullptr);
 
-    Mesh *        CreateRenderable(Primitive *r,MaterialInstance *mi,Pipeline *p);
+    Mesh *        CreateMesh(Primitive *r,MaterialInstance *mi,Pipeline *p);
-    Mesh *        CreateRenderable(PrimitiveCreater *pc,MaterialInstance *mi,Pipeline *p);
+    Mesh *        CreateMesh(PrimitiveCreater *pc,MaterialInstance *mi,Pipeline *p);
 
     Sampler *           CreateSampler(VkSamplerCreateInfo *sci=nullptr);
     Sampler *           CreateSampler(Texture *);

inc/hgl/graph/font/TextRender.h

@@ -58,7 +58,7 @@ namespace hgl
 
             bool Layout(TextPrimitive *tr,const U16String &str);
 
-            Mesh *CreateRenderable(TextPrimitive *text_primitive);
+            Mesh *CreateMesh(TextPrimitive *text_primitive);
 
             void Release(TextPrimitive *);
         };//class TextRender

src/SceneGraph/Vulkan/Mesh.cpp

@@ -62,7 +62,7 @@ Mesh::Mesh(Primitive *r,MaterialInstance *mi,Pipeline *p,MeshDataBuffer *pdb,Mes
     render_data=prd;
 }
  
-Mesh *CreateRenderable(Primitive *prim,MaterialInstance *mi,Pipeline *p)
+Mesh *CreateMesh(Primitive *prim,MaterialInstance *mi,Pipeline *p)
 {
     if(!prim||!mi||!p)return(nullptr);
 

src/SceneGraph/Vulkan/VKRenderResource.cpp

@@ -80,12 +80,12 @@ MaterialInstance *RenderResource::CreateMaterialInstance(const AnsiString &mtl_n
     return CreateMaterialInstance(mtl,vil_cfg);
 }
 
-Mesh *RenderResource::CreateRenderable(Primitive *r,MaterialInstance *mi,Pipeline *p)
+Mesh *RenderResource::CreateMesh(Primitive *r,MaterialInstance *mi,Pipeline *p)
 {
     if(!p||!mi||!r)
         return(nullptr);
 
-    Mesh *ri=VK_NAMESPACE::CreateRenderable(r,mi,p);
+    Mesh *ri=VK_NAMESPACE::CreateMesh(r,mi,p);
 
     if(ri)
         Add(ri);
@@ -93,7 +93,7 @@ Mesh *RenderResource::CreateRenderable(Primitive *r,MaterialInstance *mi,Pipelin
     return ri;
 }
 
-Mesh *RenderResource::CreateRenderable(PrimitiveCreater *pc,MaterialInstance *mi,Pipeline *p)
+Mesh *RenderResource::CreateMesh(PrimitiveCreater *pc,MaterialInstance *mi,Pipeline *p)
 {
     if(!p||!mi||!pc)
         return(nullptr);
@@ -103,7 +103,7 @@ Mesh *RenderResource::CreateRenderable(PrimitiveCreater *pc,MaterialInstance *mi
     if(!prim)
         return(nullptr);
 
-    Mesh *ri=VK_NAMESPACE::CreateRenderable(prim,mi,p);
+    Mesh *ri=VK_NAMESPACE::CreateMesh(prim,mi,p);
 
     if(ri)
     {

src/SceneGraph/render/MaterialRenderList.cpp

@@ -331,7 +331,7 @@ bool MaterialRenderList::BindVAB(const MeshDataBuffer *pdb,const uint ri_index)
     //const VIL *vil=last_vil;
 
     //if(vil->GetCount(VertexInputGroup::Basic)!=prb->vab_count)
-    //    return(false);                                                  //这里基本不太可能，因为CreateRenderable时就会检查值是否一样
+    //    return(false);                                                  //这里基本不太可能，因为CreateMesh时就会检查值是否一样
 
     vab_list->Restart();
 

src/Work/WorkObject.cpp

@@ -98,7 +98,7 @@ namespace hgl
         return prim;
     }
 
-    graph::Mesh *WorkObject::CreateRenderable( const AnsiString &name,
+    graph::Mesh *WorkObject::CreateMesh( const AnsiString &name,
                                                      const uint32_t vertices_count,
                                                      graph::MaterialInstance *mi,
                                                      graph::Pipeline *pipeline,
@@ -109,6 +109,6 @@ namespace hgl
         if(!prim)
             return(nullptr);
 
-        return db->CreateRenderable(prim,mi,pipeline);
+        return db->CreateMesh(prim,mi,pipeline);
     }
 }//namespcae hgl