From 43c60c16e2dcffac7d8e790fefd20a742a6f982e Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Fri, 24 Jun 2022 18:00:22 +0800 Subject: [PATCH] upgrade many value name. --- example/2dVector/line.cpp | 8 +++---- example/2dVector/roundbox.cpp | 8 +++---- example/Vulkan/DrawTile.cpp | 12 +++++----- example/Vulkan/FragCoordTest.cpp | 8 +++---- example/Vulkan/FullScreenTriangle.cpp | 6 ++--- example/Vulkan/InstanceTriangle.cpp | 10 ++++----- example/Vulkan/LoadStaticMesh.cpp | 22 +++++++++---------- example/Vulkan/OffscreenRender.cpp | 12 +++++----- example/Vulkan/RectanglePrimitive.cpp | 12 +++++----- example/Vulkan/first_triangle.cpp | 10 ++++----- example/Vulkan/indices_rect.cpp | 10 ++++----- example/Vulkan/second_triangle.cpp | 10 ++++----- example/Vulkan/texture_rect.cpp | 12 +++++----- example/Vulkan/third_triangle.cpp | 10 ++++----- inc/hgl/graph/VKRenderResource.h | 2 +- inc/hgl/graph/VKRenderableInstance.h | 12 +++++----- src/SceneGraph/RenderableCreater.cpp | 12 +++++----- .../Vulkan/VKRenderableInstance.cpp | 4 ++-- 18 files changed, 90 insertions(+), 90 deletions(-) diff --git a/example/2dVector/line.cpp b/example/2dVector/line.cpp index 04fabf81..d4fed10e 100644 --- a/example/2dVector/line.cpp +++ b/example/2dVector/line.cpp @@ -113,12 +113,12 @@ private: bool InitVBO() { - Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT); - if(!render_obj)return(false); + Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT); + if(!primitive)return(false); - if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); + if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); - render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); + render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline); return(true); } diff --git a/example/2dVector/roundbox.cpp b/example/2dVector/roundbox.cpp index 4ca8a429..fdd47a9e 100644 --- a/example/2dVector/roundbox.cpp +++ b/example/2dVector/roundbox.cpp @@ -129,12 +129,12 @@ private: bool InitVBO() { - Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT); - if(!render_obj)return(false); + Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT); + if(!primitive)return(false); - if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V4I16,VERTEX_COUNT,position_data)))return(false); + if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V4I16,VERTEX_COUNT,position_data)))return(false); - render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); + render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline); return(true); } diff --git a/example/Vulkan/DrawTile.cpp b/example/Vulkan/DrawTile.cpp index 12c3c4d3..6686e18d 100644 --- a/example/Vulkan/DrawTile.cpp +++ b/example/Vulkan/DrawTile.cpp @@ -40,7 +40,7 @@ private: Sampler * sampler =nullptr; MaterialInstance * material_instance =nullptr; - Primitive * render_obj =nullptr; + Primitive * primitive =nullptr; RenderableInstance *render_instance =nullptr; Pipeline * pipeline =nullptr; @@ -174,13 +174,13 @@ private: { const uint tile_count=tile_list.GetCount(); - render_obj=db->CreatePrimitive(tile_count); - if(!render_obj)return(false); + primitive=db->CreatePrimitive(tile_count); + if(!primitive)return(false); - render_obj->Set(VAN::Position,db->CreateVBO(VF_V4F,tile_count,position_data)); - render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,tile_count,tex_coord_data)); + primitive->Set(VAN::Position,db->CreateVBO(VF_V4F,tile_count,position_data)); + primitive->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,tile_count,tex_coord_data)); - render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); + render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline); return(render_instance); } diff --git a/example/Vulkan/FragCoordTest.cpp b/example/Vulkan/FragCoordTest.cpp index eead223d..cfc9df61 100644 --- a/example/Vulkan/FragCoordTest.cpp +++ b/example/Vulkan/FragCoordTest.cpp @@ -47,12 +47,12 @@ private: bool InitVBO() { - auto render_obj=db->CreatePrimitive(VERTEX_COUNT); - if(!render_obj)return(false); + auto primitive=db->CreatePrimitive(VERTEX_COUNT); + if(!primitive)return(false); - if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); + if(!primitive->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); - renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); + renderable_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline); return(true); } diff --git a/example/Vulkan/FullScreenTriangle.cpp b/example/Vulkan/FullScreenTriangle.cpp index bbdde4ea..83b615e4 100644 --- a/example/Vulkan/FullScreenTriangle.cpp +++ b/example/Vulkan/FullScreenTriangle.cpp @@ -35,10 +35,10 @@ private: bool InitVBO() { - auto render_obj=db->CreatePrimitive(3); - if(!render_obj)return(false); + auto primitive=db->CreatePrimitive(3); + if(!primitive)return(false); - renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); + renderable_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline); return(true); } diff --git a/example/Vulkan/InstanceTriangle.cpp b/example/Vulkan/InstanceTriangle.cpp index f631aa9f..b9c983dc 100644 --- a/example/Vulkan/InstanceTriangle.cpp +++ b/example/Vulkan/InstanceTriangle.cpp @@ -53,13 +53,13 @@ private: bool InitVBO() { - Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT); - if(!render_obj)return(false); + Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT); + if(!primitive)return(false); - if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); - if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); + if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); + if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); - render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); + render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline); return(true); } diff --git a/example/Vulkan/LoadStaticMesh.cpp b/example/Vulkan/LoadStaticMesh.cpp index eb06eaa7..1de4ff2b 100644 --- a/example/Vulkan/LoadStaticMesh.cpp +++ b/example/Vulkan/LoadStaticMesh.cpp @@ -29,7 +29,7 @@ vulkan::Primitive *CreateMeshRenderable(Database *db,vulkan::Material *mtl,const uint draw_count=mesh->indices_count; - vulkan::Primitive *render_obj=nullptr; + vulkan::Primitive *primitive=nullptr; { const int vertex_binding=vsm->GetStageInputBinding("Vertex"); @@ -38,9 +38,9 @@ vulkan::Primitive *CreateMeshRenderable(Database *db,vulkan::Material *mtl,const vulkan::VAB *vbo=db->CreateVAB(VAF_VEC3,mesh->vertex_count,mesh->position); - render_obj=mtl->CreateRenderable(); - render_obj->Set(vertex_binding,vbo); - render_obj->SetBoundingBox(mesh->bounding_box); + primitive=mtl->CreateRenderable(); + primitive->Set(vertex_binding,vbo); + primitive->SetBoundingBox(mesh->bounding_box); } const int normal_binding=vsm->GetStageInputBinding("Normal"); @@ -49,7 +49,7 @@ vulkan::Primitive *CreateMeshRenderable(Database *db,vulkan::Material *mtl,const { vulkan::VAB *vbo=db->CreateVAB(VAF_VEC3,mesh->vertex_count,mesh->normal); - render_obj->Set(normal_binding,vbo); + primitive->Set(normal_binding,vbo); } const int tagent_binding=vsm->GetStageInputBinding("Tangent"); @@ -58,7 +58,7 @@ vulkan::Primitive *CreateMeshRenderable(Database *db,vulkan::Material *mtl,const { vulkan::VAB *vbo=db->CreateVAB(VAF_VEC3,mesh->vertex_count,mesh->tangent); - render_obj->Set(tagent_binding,vbo); + primitive->Set(tagent_binding,vbo); } const int bitagent_binding=vsm->GetStageInputBinding("Bitangent"); @@ -67,16 +67,16 @@ vulkan::Primitive *CreateMeshRenderable(Database *db,vulkan::Material *mtl,const { vulkan::VAB *vbo=db->CreateVAB(VAF_VEC3,mesh->vertex_count,mesh->bitangent); - render_obj->Set(bitagent_binding,vbo); + primitive->Set(bitagent_binding,vbo); } if(mesh->vertex_count<=0xFFFF) - render_obj->Set(db->CreateIBO16(mesh->indices_count,mesh->indices16)); + primitive->Set(db->CreateIBO16(mesh->indices_count,mesh->indices16)); else - render_obj->Set(db->CreateIBO32(mesh->indices_count,mesh->indices32)); + primitive->Set(db->CreateIBO32(mesh->indices_count,mesh->indices32)); - db->Add(render_obj); - return(render_obj); + db->Add(primitive); + return(primitive); } class TestApp:public CameraAppFramework diff --git a/example/Vulkan/OffscreenRender.cpp b/example/Vulkan/OffscreenRender.cpp index 7859c40d..05f37386 100644 --- a/example/Vulkan/OffscreenRender.cpp +++ b/example/Vulkan/OffscreenRender.cpp @@ -105,10 +105,10 @@ public: cci.center_color=Vector4f(1,1,1,1); cci.border_color=Vector4f(1,1,1,0); - Primitive *render_obj=CreateRenderableCircle(db,os.material_instance->GetVAB(),&cci); - if(!render_obj)return(false); + Primitive *primitive=CreateRenderableCircle(db,os.material_instance->GetVAB(),&cci); + if(!primitive)return(false); - os.renderable_instance=db->CreateRenderableInstance(render_obj,os.material_instance,os.pipeline); + os.renderable_instance=db->CreateRenderableInstance(primitive,os.material_instance,os.pipeline); if(!os.renderable_instance)return(false); } @@ -141,10 +141,10 @@ public: cci.tex_coord=true; - Primitive *render_obj=CreateRenderableCube(db,cube.material_instance->GetVAB(),&cci); - if(!render_obj)return(false); + Primitive *primitive=CreateRenderableCube(db,cube.material_instance->GetVAB(),&cci); + if(!primitive)return(false); - cube.renderable_instance=db->CreateRenderableInstance(render_obj,cube.material_instance,cube.pipeline); + cube.renderable_instance=db->CreateRenderableInstance(primitive,cube.material_instance,cube.pipeline); cube.scene_root.CreateSubNode(cube.renderable_instance); } diff --git a/example/Vulkan/RectanglePrimitive.cpp b/example/Vulkan/RectanglePrimitive.cpp index 85707997..28985adc 100644 --- a/example/Vulkan/RectanglePrimitive.cpp +++ b/example/Vulkan/RectanglePrimitive.cpp @@ -37,7 +37,7 @@ private: Texture2D * texture =nullptr; Sampler * sampler =nullptr; MaterialInstance * material_instance =nullptr; - Primitive * render_obj =nullptr; + Primitive * primitive =nullptr; RenderableInstance *render_instance =nullptr; Pipeline * pipeline =nullptr; @@ -66,14 +66,14 @@ private: bool InitVBO() { - render_obj=db->CreatePrimitive(VERTEX_COUNT); + primitive=db->CreatePrimitive(VERTEX_COUNT); - if(!render_obj)return(false); + if(!primitive)return(false); - render_obj->Set(VAN::Position,db->CreateVBO(VF_V4F,VERTEX_COUNT,position_data)); - render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,VERTEX_COUNT,tex_coord_data)); + primitive->Set(VAN::Position,db->CreateVBO(VF_V4F,VERTEX_COUNT,position_data)); + primitive->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,VERTEX_COUNT,tex_coord_data)); - render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); + render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline); return(render_instance); } diff --git a/example/Vulkan/first_triangle.cpp b/example/Vulkan/first_triangle.cpp index 508503ce..2e2a3973 100644 --- a/example/Vulkan/first_triangle.cpp +++ b/example/Vulkan/first_triangle.cpp @@ -53,13 +53,13 @@ private: bool InitVBO() { - Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT); - if(!render_obj)return(false); + Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT); + if(!primitive)return(false); - if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); - if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); + if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); + if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); - render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); + render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline); return(true); } diff --git a/example/Vulkan/indices_rect.cpp b/example/Vulkan/indices_rect.cpp index ec4288ea..e6722542 100644 --- a/example/Vulkan/indices_rect.cpp +++ b/example/Vulkan/indices_rect.cpp @@ -56,13 +56,13 @@ private: bool InitVBO() { - auto render_obj=db->CreatePrimitive(VERTEX_COUNT); - if(!render_obj)return(false); + auto primitive=db->CreatePrimitive(VERTEX_COUNT); + if(!primitive)return(false); - if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); - if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false); + if(!primitive->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); + if(!primitive->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false); - renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); + renderable_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline); return(true); } diff --git a/example/Vulkan/second_triangle.cpp b/example/Vulkan/second_triangle.cpp index d8fa67ee..e401d108 100644 --- a/example/Vulkan/second_triangle.cpp +++ b/example/Vulkan/second_triangle.cpp @@ -55,13 +55,13 @@ private: bool InitVBO() { - Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT); - if(!render_obj)return(false); + Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT); + if(!primitive)return(false); - if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); - if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); + if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); + if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); - render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); + render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline); return(true); } diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index 6785be9b..7bc11a3e 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -80,14 +80,14 @@ private: bool InitVBO() { - auto render_obj=db->CreatePrimitive(VERTEX_COUNT); - if(!render_obj)return(false); + auto primitive=db->CreatePrimitive(VERTEX_COUNT); + if(!primitive)return(false); - if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); - if(!render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V2F,VERTEX_COUNT,tex_coord_data)))return(false); - if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false); + if(!primitive->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); + if(!primitive->Set(VAN::TexCoord,db->CreateVBO(VF_V2F,VERTEX_COUNT,tex_coord_data)))return(false); + if(!primitive->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false); - renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); + renderable_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline); return(true); } diff --git a/example/Vulkan/third_triangle.cpp b/example/Vulkan/third_triangle.cpp index 6b179497..ca754c98 100644 --- a/example/Vulkan/third_triangle.cpp +++ b/example/Vulkan/third_triangle.cpp @@ -57,13 +57,13 @@ private: bool InitVBO() { - Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT); - if(!render_obj)return(false); + Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT); + if(!primitive)return(false); - if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); - if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); + if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); + if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); - render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); + render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline); render_root.CreateSubNode(render_instance); diff --git a/inc/hgl/graph/VKRenderResource.h b/inc/hgl/graph/VKRenderResource.h index 08b9a2af..393bf40e 100644 --- a/inc/hgl/graph/VKRenderResource.h +++ b/inc/hgl/graph/VKRenderResource.h @@ -110,7 +110,7 @@ public: //Get Material * GetMaterial (const MaterialID &id){return rm_material.Get(id);} MaterialInstance * GetMaterialInstance (const MaterialInstanceID &id){return rm_material_instance.Get(id);} DescriptorSets * GetDescSets (const DescriptorSetsID &id){return rm_desc_sets.Get(id);} - Primitive * GetRenderable (const PrimitiveID &id){return rm_primitives.Get(id);} + Primitive * GetPrimitive (const PrimitiveID &id){return rm_primitives.Get(id);} GPUBuffer * GetBuffer (const BufferID &id){return rm_buffers.Get(id);} Sampler * GetSampler (const SamplerID &id){return rm_samplers.Get(id);} Texture * GetTexture (const TextureID &id){return rm_textures.Get(id);} diff --git a/inc/hgl/graph/VKRenderableInstance.h b/inc/hgl/graph/VKRenderableInstance.h index 9b3caf9f..061dacc5 100644 --- a/inc/hgl/graph/VKRenderableInstance.h +++ b/inc/hgl/graph/VKRenderableInstance.h @@ -16,7 +16,7 @@ class RenderableInstance { Pipeline * pipeline; MaterialInstance * mat_inst; - Primitive * render_obj; + Primitive * primitive; uint32_t buffer_count; VkBuffer * buffer_list; @@ -40,15 +40,15 @@ public: VkPipelineLayout GetPipelineLayout (){return mat_inst->GetMaterial()->GetPipelineLayout();} Material * GetMaterial (){return mat_inst->GetMaterial();} MaterialInstance * GetMaterialInstance (){return mat_inst;} - Primitive * GetRenderable (){return render_obj;} - const AABB & GetBoundingBox ()const{return render_obj->GetBoundingBox();} + Primitive * GetPrimitive (){return primitive;} + const AABB & GetBoundingBox ()const{return primitive->GetBoundingBox();} const uint32_t GetBufferCount ()const{return buffer_count;} VkBuffer * GetBuffer ()const{return buffer_list;} VkDeviceSize * GetBufferSize ()const{return buffer_size;} - IndexBuffer * GetIndexBuffer ()const{return render_obj->GetIndexBuffer();} - const uint32_t GetIndexBufferOffset()const{return render_obj->GetIndexBufferOffset();} - const uint32_t GetDrawCount ()const{return render_obj->GetDrawCount();} + IndexBuffer * GetIndexBuffer ()const{return primitive->GetIndexBuffer();} + const uint32_t GetIndexBufferOffset()const{return primitive->GetIndexBufferOffset();} + const uint32_t GetDrawCount ()const{return primitive->GetDrawCount();} const uint32_t GetBufferHash ()const{return buffer_hash;} diff --git a/src/SceneGraph/RenderableCreater.cpp b/src/SceneGraph/RenderableCreater.cpp index ba7d5d8b..773159b8 100644 --- a/src/SceneGraph/RenderableCreater.cpp +++ b/src/SceneGraph/RenderableCreater.cpp @@ -112,15 +112,15 @@ namespace hgl if(ssb_map.GetCount()!=si_count) return(nullptr); - Primitive *render_obj=db->CreatePrimitive(vertices_number); + Primitive *primitive=db->CreatePrimitive(vertices_number); const auto *sp=ssb_map.GetDataList(); for(uint i=0;iright->vbo) - render_obj->Set((*sp)->left,(*sp)->right->vbo); + primitive->Set((*sp)->left,(*sp)->right->vbo); else - render_obj->Set((*sp)->left,db->CreateVBO((*sp)->right->data)); + primitive->Set((*sp)->left,db->CreateVBO((*sp)->right->data)); ++sp; } @@ -128,12 +128,12 @@ namespace hgl if(ibo) { ibo->Unmap(); - render_obj->Set(ibo); + primitive->Set(ibo); } - db->Add(render_obj); + db->Add(primitive); - return render_obj; + return primitive; } }//namespace graph }//namespace hgl diff --git a/src/SceneGraph/Vulkan/VKRenderableInstance.cpp b/src/SceneGraph/Vulkan/VKRenderableInstance.cpp index c14fa257..355b58a4 100644 --- a/src/SceneGraph/Vulkan/VKRenderableInstance.cpp +++ b/src/SceneGraph/Vulkan/VKRenderableInstance.cpp @@ -10,7 +10,7 @@ using namespace util; RenderableInstance::RenderableInstance(Primitive *r,MaterialInstance *mi,Pipeline *p,const uint32_t count,VkBuffer *bl,VkDeviceSize *bs) { - render_obj=r; + primitive=r; pipeline=p; mat_inst=mi; @@ -26,7 +26,7 @@ RenderableInstance::RenderableInstance(Primitive *r,MaterialInstance *mi,Pipelin RenderableInstance::~RenderableInstance() { - //需要在这里添加删除pipeline/desc_sets/render_obj引用计数的代码 + //需要在这里添加删除pipeline/desc_sets/primitive引用计数的代码 delete[] buffer_list; delete[] buffer_size;