diff --git a/example/2dVector/LerpLine.cpp b/example/2dVector/LerpLine.cpp index 295c7f51..5c4158cc 100644 --- a/example/2dVector/LerpLine.cpp +++ b/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); } diff --git a/example/2dVector/line.cpp b/example/2dVector/line.cpp index b7db4cc7..1801a0a2 100644 --- a/example/2dVector/line.cpp +++ b/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); } diff --git a/example/2dVector/roundbox.cpp b/example/2dVector/roundbox.cpp index bad926db..5368d32d 100644 --- a/example/2dVector/roundbox.cpp +++ b/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); } diff --git a/example/Basic/BillboardTest.cpp b/example/Basic/BillboardTest.cpp index 7f080d1b..6a1cc7ae 100644 --- a/example/Basic/BillboardTest.cpp +++ b/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); } diff --git a/example/Basic/auto_instance.cpp b/example/Basic/auto_instance.cpp index f8e1c722..c4e0dc68 100644 --- a/example/Basic/auto_instance.cpp +++ b/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 } diff --git a/example/Basic/auto_merge_material_instance.cpp b/example/Basic/auto_merge_material_instance.cpp index 25063020..e324031c 100644 --- a/example/Basic/auto_merge_material_instance.cpp +++ b/example/Basic/auto_merge_material_instance.cpp @@ -95,7 +95,7 @@ private: for(uint i=0;iCreateRenderable(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); diff --git a/example/Basic/draw_triangle_in_NDC.cpp b/example/Basic/draw_triangle_in_NDC.cpp index 6dc16b60..2c14ace3 100644 --- a/example/Basic/draw_triangle_in_NDC.cpp +++ b/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} diff --git a/example/Basic/draw_triangle_use_UBO.cpp b/example/Basic/draw_triangle_use_UBO.cpp index c40349f0..1f90047b 100644 --- a/example/Basic/draw_triangle_use_UBO.cpp +++ b/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} diff --git a/example/Basic/rf_test.cpp b/example/Basic/rf_test.cpp index bc256851..43dc83f4 100644 --- a/example/Basic/rf_test.cpp +++ b/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} diff --git a/example/GUI/DrawText.cpp b/example/GUI/DrawText.cpp index 81623db8..0b6de7c3 100644 --- a/example/GUI/DrawText.cpp +++ b/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); diff --git a/example/Gizmo/GizmoResource.cpp b/example/Gizmo/GizmoResource.cpp index e7a0f731..712f659f 100644 --- a/example/Gizmo/GizmoResource.cpp +++ b/example/Gizmo/GizmoResource.cpp @@ -58,7 +58,7 @@ namespace gr->prim=prim; for(uint i=0;irenderable[i]=CreateRenderable(prim,gizmo_triangle.mi[i],p); + gr->renderable[i]=CreateMesh(prim,gizmo_triangle.mi[i],p); } bool InitMI(GizmoResource *gr) diff --git a/example/Gizmo/MetricCellsGrid.cpp b/example/Gizmo/MetricCellsGrid.cpp index 1bab9fe9..542ce5b3 100644 --- a/example/Gizmo/MetricCellsGrid.cpp +++ b/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); diff --git a/example/Gizmo/PlaneGrid3D.cpp b/example/Gizmo/PlaneGrid3D.cpp index e5422b36..a63cc6b3 100644 --- a/example/Gizmo/PlaneGrid3D.cpp +++ b/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); diff --git a/example/Gizmo/RayPicking.cpp b/example/Gizmo/RayPicking.cpp index f2ccb468..c600f36a 100644 --- a/example/Gizmo/RayPicking.cpp +++ b/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) { diff --git a/example/LightBasic/BlinnPhongDirectionLight.cpp b/example/LightBasic/BlinnPhongDirectionLight.cpp index ab502bee..6e3502c2 100644 --- a/example/LightBasic/BlinnPhongDirectionLight.cpp +++ b/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) { diff --git a/example/Texture/texture_quad.cpp b/example/Texture/texture_quad.cpp index 8e719048..cd82052e 100644 --- a/example/Texture/texture_quad.cpp +++ b/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); } diff --git a/example/Texture/texture_rect.cpp b/example/Texture/texture_rect.cpp index d0149ae3..af1c16b6 100644 --- a/example/Texture/texture_rect.cpp +++ b/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); } diff --git a/example/Texture/texture_rect_array.cpp b/example/Texture/texture_rect_array.cpp index 88d9b5e7..d2efb423 100644 --- a/example/Texture/texture_rect_array.cpp +++ b/example/Texture/texture_rect_array.cpp @@ -144,7 +144,7 @@ private: for(uint32_t i=0;iCreateRenderable(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); diff --git a/inc/hgl/WorkObject.h b/inc/hgl/WorkObject.h index 2c7b1a3e..8e5fc88e 100644 --- a/inc/hgl/WorkObject.h +++ b/inc/hgl/WorkObject.h @@ -91,7 +91,7 @@ namespace hgl const graph::VIL *vil, const std::initializer_list &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, diff --git a/inc/hgl/graph/Mesh.h b/inc/hgl/graph/Mesh.h index 34a41dee..999f7a47 100644 --- a/inc/hgl/graph/Mesh.h +++ b/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 diff --git a/inc/hgl/graph/RenderList.h b/inc/hgl/graph/RenderList.h index 0ac4af45..81af69f7 100644 --- a/inc/hgl/graph/RenderList.h +++ b/inc/hgl/graph/RenderList.h @@ -18,7 +18,7 @@ namespace hgl { protected: - VulkanDevice * device; + VulkanDevice * device; CameraInfo * camera_info; ///<相机信息 diff --git a/inc/hgl/graph/SceneNode.h b/inc/hgl/graph/SceneNode.h index 7c0dd62f..0c054913 100644 --- a/inc/hgl/graph/SceneNode.h +++ b/inc/hgl/graph/SceneNode.h @@ -86,8 +86,8 @@ namespace hgl const SceneNode * GetParent()const noexcept{return ParentNode;} void SetRenderable(Mesh *); - Mesh *GetRenderable() noexcept{return render_obj;} - const Mesh *GetRenderable()const noexcept{return render_obj;} + Mesh * GetRenderable() noexcept{return render_obj;} + const Mesh * GetRenderable()const noexcept{return render_obj;} SceneNode *Add(SceneNode *sn) { diff --git a/inc/hgl/graph/VKRenderResource.h b/inc/hgl/graph/VKRenderResource.h index 75e105aa..673363b5 100644 --- a/inc/hgl/graph/VKRenderResource.h +++ b/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 * CreateRenderable(PrimitiveCreater *pc,MaterialInstance *mi,Pipeline *p); + Mesh * CreateMesh(Primitive *r,MaterialInstance *mi,Pipeline *p); + Mesh * CreateMesh(PrimitiveCreater *pc,MaterialInstance *mi,Pipeline *p); Sampler * CreateSampler(VkSamplerCreateInfo *sci=nullptr); Sampler * CreateSampler(Texture *); diff --git a/inc/hgl/graph/font/TextRender.h b/inc/hgl/graph/font/TextRender.h index f049914b..2e6abf3b 100644 --- a/inc/hgl/graph/font/TextRender.h +++ b/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 diff --git a/src/SceneGraph/Vulkan/Mesh.cpp b/src/SceneGraph/Vulkan/Mesh.cpp index 4d0d826d..5ed01d21 100644 --- a/src/SceneGraph/Vulkan/Mesh.cpp +++ b/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); diff --git a/src/SceneGraph/Vulkan/VKRenderResource.cpp b/src/SceneGraph/Vulkan/VKRenderResource.cpp index 9527cef5..557746dc 100644 --- a/src/SceneGraph/Vulkan/VKRenderResource.cpp +++ b/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) { diff --git a/src/SceneGraph/render/MaterialRenderList.cpp b/src/SceneGraph/render/MaterialRenderList.cpp index 9a7cd227..fd14e8af 100644 --- a/src/SceneGraph/render/MaterialRenderList.cpp +++ b/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(); diff --git a/src/Work/WorkObject.cpp b/src/Work/WorkObject.cpp index 424b4c81..06617cc5 100644 --- a/src/Work/WorkObject.cpp +++ b/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