diff --git a/inc/hgl/graph/PrimitiveCreater.h b/inc/hgl/graph/PrimitiveCreater.h index 4df93d04..24248c41 100644 --- a/inc/hgl/graph/PrimitiveCreater.h +++ b/inc/hgl/graph/PrimitiveCreater.h @@ -48,7 +48,7 @@ namespace hgl virtual bool Init(const uint32 vertices_count); ///<初始化,参数为顶点数量 template - T * AccessVAD(const AnsiString &name) ///<创建一个顶点属性数据缓冲区以及访问器 + T * AccessVBO(const AnsiString &name) ///<创建一个顶点属性数据缓冲区以及访问器 { const VkFormat format=vil->GetVulkanFormat(name); @@ -67,10 +67,10 @@ namespace hgl return access; } - bool WriteVAD(const AnsiString &name,const void *data,const uint32_t bytes); ///<直接写入顶点属性数据 + bool WriteVBO(const AnsiString &name,const void *data,const uint32_t bytes); ///<直接写入顶点属性数据 template - T * CreateIBO(const uint count,const T *data=nullptr) ///<创建索引缓冲区 + T * CreateIBO(const uint count,const T *data=nullptr) ///<创建索引缓冲区 { if(ibo) return(nullptr); diff --git a/src/SceneGraph/InlineGeometry.cpp b/src/SceneGraph/InlineGeometry.cpp index 2898c6a7..5e9a3865 100644 --- a/src/SceneGraph/InlineGeometry.cpp +++ b/src/SceneGraph/InlineGeometry.cpp @@ -21,7 +21,7 @@ namespace hgl if(!rc.Init(4)) return(nullptr); - AutoDelete vertex=rc.AccessVAD(VAN::Position); + AutoDelete vertex=rc.AccessVBO(VAN::Position); if(!vertex) return(nullptr); @@ -49,7 +49,7 @@ namespace hgl if(!rc.Init(4)) return(nullptr); - AutoDelete vertex=rc.AccessVAD(VAN::Position); + AutoDelete vertex=rc.AccessVBO(VAN::Position); vertex->WriteRectFan(rci->scope); } @@ -63,7 +63,7 @@ namespace hgl if(!rc.Init(rci->round_per*4)) return(nullptr); - AutoDelete vertex=rc.AccessVAD(VAN::Position); + AutoDelete vertex=rc.AccessVBO(VAN::Position); Vector2f *coord=new Vector2f[rci->round_per]; @@ -131,8 +131,8 @@ namespace hgl if(!rc.Init(cci->field_count))return(nullptr); } - AutoDelete vertex=rc.AccessVAD(VAN::Position); - AutoDelete color=rc.AccessVAD(VAN::Color); + AutoDelete vertex=rc.AccessVBO(VAN::Position); + AutoDelete color=rc.AccessVBO(VAN::Color); if(!vertex) return(nullptr); @@ -169,7 +169,7 @@ namespace hgl if(!rc.Init(((pgci->grid_size.Width()+1)+(pgci->grid_size.Height()+1))*2)) return(nullptr); - AutoDelete vertex=rc.AccessVAD(VAN::Position); + AutoDelete vertex=rc.AccessVBO(VAN::Position); const float right=float(pgci->grid_size.Width())/2.0f; const float left =-right; @@ -189,7 +189,7 @@ namespace hgl Vector3f(left+col,bottom,0)); } - AutoDelete lum=rc.AccessVAD(VAN::Luminance); + AutoDelete lum=rc.AccessVBO(VAN::Luminance); if(lum) { for(int row=0;row<=pgci->grid_size.Height();row++) @@ -224,22 +224,22 @@ namespace hgl if(!rc.Init(4)) return(nullptr); - rc.WriteVAD(VAN::Position,xy_vertices,sizeof(xy_vertices)); + rc.WriteVBO(VAN::Position,xy_vertices,sizeof(xy_vertices)); { - AutoDelete normal=rc.AccessVAD(VAN::Normal); + AutoDelete normal=rc.AccessVBO(VAN::Normal); if(normal)normal->RepeatWrite(xy_normal,4); } { - AutoDelete tangent=rc.AccessVAD(VAN::Tangent); + AutoDelete tangent=rc.AccessVBO(VAN::Tangent); if(tangent)tangent->RepeatWrite(xy_tangent,4); } { - AutoDelete tex_coord=rc.AccessVAD(VAN::TexCoord); + AutoDelete tex_coord=rc.AccessVBO(VAN::TexCoord); if(tex_coord) tex_coord->Write(xy_tex_coord,4); @@ -306,22 +306,22 @@ namespace hgl if(!rc.Init(24)) return(nullptr); - rc.WriteVAD(VAN::Position,positions,sizeof(positions)); + rc.WriteVBO(VAN::Position,positions,sizeof(positions)); if(cci->normal) - rc.WriteVAD(VAN::Normal,normals,sizeof(normals)); + rc.WriteVBO(VAN::Normal,normals,sizeof(normals)); if(cci->tangent) - rc.WriteVAD(VAN::Tangent,tangents,sizeof(tangents)); + rc.WriteVBO(VAN::Tangent,tangents,sizeof(tangents)); if(cci->tex_coord) - rc.WriteVAD(VAN::TexCoord,tex_coords,sizeof(tex_coords)); + rc.WriteVBO(VAN::TexCoord,tex_coords,sizeof(tex_coords)); if(cci->color_type!=CubeCreateInfo::ColorType::NoColor) { RANGE_CHECK_RETURN_NULLPTR(cci->color_type); - AutoDelete color=rc.AccessVAD(VAN::Color); + AutoDelete color=rc.AccessVBO(VAN::Color); if(color) { @@ -459,10 +459,10 @@ namespace hgl if(!rc.Init(numberVertices)) return(nullptr); - AutoDelete vertex=rc.AccessVAD(VAN::Position); - AutoDelete normal=rc.AccessVAD(VAN::Normal); - AutoDelete tangent=rc.AccessVAD(VAN::Tangent); - AutoDelete tex_coord=rc.AccessVAD(VAN::TexCoord); + AutoDelete vertex=rc.AccessVBO(VAN::Position); + AutoDelete normal=rc.AccessVBO(VAN::Normal); + AutoDelete tangent=rc.AccessVBO(VAN::Tangent); + AutoDelete tex_coord=rc.AccessVBO(VAN::TexCoord); float *vp=vertex->Get(); float *np=normal?normal->Get():nullptr; @@ -540,10 +540,10 @@ namespace hgl if(!rc.Init(numberVertices)) return(nullptr); - AutoDelete vertex=rc.AccessVAD(VAN::Position); - AutoDelete normal=rc.AccessVAD(VAN::Normal); - AutoDelete tangent=rc.AccessVAD(VAN::Tangent); - AutoDelete tex_coord=rc.AccessVAD(VAN::TexCoord); + AutoDelete vertex=rc.AccessVBO(VAN::Position); + AutoDelete normal=rc.AccessVBO(VAN::Normal); + AutoDelete tangent=rc.AccessVBO(VAN::Tangent); + AutoDelete tex_coord=rc.AccessVBO(VAN::TexCoord); float *vp=vertex->Get(); float *np=normal?normal->Get():nullptr; @@ -677,10 +677,10 @@ namespace hgl if(!rc.Init(numberVertices)) return(nullptr); - AutoDelete vertex=rc.AccessVAD(VAN::Position); - AutoDelete normal=rc.AccessVAD(VAN::Normal); - AutoDelete tangent=rc.AccessVAD(VAN::Tangent); - AutoDelete tex_coord=rc.AccessVAD(VAN::TexCoord); + AutoDelete vertex=rc.AccessVBO(VAN::Position); + AutoDelete normal=rc.AccessVBO(VAN::Normal); + AutoDelete tangent=rc.AccessVBO(VAN::Tangent); + AutoDelete tex_coord=rc.AccessVBO(VAN::TexCoord); float *vp=vertex->Get(); float *np=normal?normal->Get():nullptr; @@ -812,10 +812,10 @@ namespace hgl if (cci->numberSlices < 3 || numberVertices > GLUS_MAX_VERTICES || numberIndices > GLUS_MAX_INDICES) return nullptr; - AutoDelete vertex=rc.AccessVAD(VAN::Position); - AutoDelete normal=rc.AccessVAD(VAN::Normal); - AutoDelete tangent=rc.AccessVAD(VAN::Tangent); - AutoDelete tex_coord=rc.AccessVAD(VAN::TexCoord); + AutoDelete vertex=rc.AccessVBO(VAN::Position); + AutoDelete normal=rc.AccessVBO(VAN::Normal); + AutoDelete tangent=rc.AccessVBO(VAN::Tangent); + AutoDelete tex_coord=rc.AccessVBO(VAN::TexCoord); float *vp=vertex->Get(); float *np=normal?normal->Get():nullptr; @@ -1034,10 +1034,10 @@ namespace hgl if (cci->numberSlices < 3 || cci->numberStacks < 1 || numberVertices > GLUS_MAX_VERTICES || numberIndices > GLUS_MAX_INDICES) return nullptr; - AutoDelete vertex=rc.AccessVAD(VAN::Position); - AutoDelete normal=rc.AccessVAD(VAN::Normal); - AutoDelete tangent=rc.AccessVAD(VAN::Tangent); - AutoDelete tex_coord=rc.AccessVAD(VAN::TexCoord); + AutoDelete vertex=rc.AccessVBO(VAN::Position); + AutoDelete normal=rc.AccessVBO(VAN::Normal); + AutoDelete tangent=rc.AccessVBO(VAN::Tangent); + AutoDelete tex_coord=rc.AccessVBO(VAN::TexCoord); float *vp=vertex->Get(); float *np=normal?normal->Get():nullptr; @@ -1148,8 +1148,8 @@ namespace hgl if(!rc.Init(6)) return(nullptr); - AutoDelete vertex=rc.AccessVAD(VAN::Position); - AutoDelete color=rc.AccessVAD(VAN::Color); + AutoDelete vertex=rc.AccessVBO(VAN::Position); + AutoDelete color=rc.AccessVBO(VAN::Color); if(!vertex||!color) return(nullptr); @@ -1193,17 +1193,17 @@ namespace hgl if(!rc.Init(8)) return(nullptr); - AutoDelete vertex=rc.AccessVAD(VAN::Position); + AutoDelete vertex=rc.AccessVBO(VAN::Position); if(!vertex)return(nullptr); - rc.WriteVAD(VAN::Position,points,sizeof(points)); + rc.WriteVBO(VAN::Position,points,sizeof(points)); if(cci->color_type!=BoundingBoxCreateInfo::ColorType::NoColor) { RANGE_CHECK_RETURN_NULLPTR(cci->color_type); - AutoDelete color=rc.AccessVAD(VAN::Color); + AutoDelete color=rc.AccessVBO(VAN::Color); if(color) { diff --git a/src/SceneGraph/PrimitiveCreater.cpp b/src/SceneGraph/PrimitiveCreater.cpp index d8757b13..d4d8e830 100644 --- a/src/SceneGraph/PrimitiveCreater.cpp +++ b/src/SceneGraph/PrimitiveCreater.cpp @@ -53,7 +53,7 @@ namespace hgl return pvb; } - bool PrimitiveCreater::WriteVAD(const AnsiString &name,const void *data,const uint32_t bytes) + bool PrimitiveCreater::WriteVBO(const AnsiString &name,const void *data,const uint32_t bytes) { if(!vil)return(false); if(name.IsEmpty())return(false);