From d4c1dd312e245e8dbf4d23101e13c34c4288cc55 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 2 Apr 2024 22:19:02 +0800 Subject: [PATCH] renamed to "vad" from "data" in PrimitiveVertexBuffer --- inc/hgl/graph/PrimitiveCreater.h | 4 ++-- src/SceneGraph/PrimitiveCreater.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/inc/hgl/graph/PrimitiveCreater.h b/inc/hgl/graph/PrimitiveCreater.h index c50b3408..e5de81f9 100644 --- a/inc/hgl/graph/PrimitiveCreater.h +++ b/inc/hgl/graph/PrimitiveCreater.h @@ -17,14 +17,14 @@ namespace hgl { AnsiString name; uint binding; - VAD * data =nullptr; + VAD * vad =nullptr; VBO * vbo =nullptr; public: ~PrimitiveVertexBuffer() { - SAFE_CLEAR(data); + SAFE_CLEAR(vad); } };//struct PrimitiveVertexBuffer diff --git a/src/SceneGraph/PrimitiveCreater.cpp b/src/SceneGraph/PrimitiveCreater.cpp index f02d6d8a..45e75d4c 100644 --- a/src/SceneGraph/PrimitiveCreater.cpp +++ b/src/SceneGraph/PrimitiveCreater.cpp @@ -36,7 +36,7 @@ namespace hgl PrimitiveVertexBuffer *pvb; if(vbo_map.Get(name,pvb)) - return pvb->data; + return pvb->vad; VAD *vad=hgl::graph::CreateVertexAttribData(vertices_number,vif); @@ -45,7 +45,7 @@ namespace hgl pvb=new PrimitiveVertexBuffer; - pvb->data =vad; + pvb->vad =vad; pvb->name =name; pvb->binding=vif->binding; @@ -53,7 +53,7 @@ namespace hgl vbo_map.Add(name,pvb); - return pvb->data; + return pvb->vad; } bool PrimitiveCreater::WriteVAD(const AnsiString &name,const void *data,const uint32_t bytes) @@ -78,7 +78,7 @@ namespace hgl pvb=new PrimitiveVertexBuffer; - pvb->data =nullptr; + pvb->vad =nullptr; pvb->name =name; pvb->binding=vif->binding; @@ -104,7 +104,7 @@ namespace hgl if((*sp)->value->vbo) primitive->Set((*sp)->key,(*sp)->value->vbo); else - primitive->Set((*sp)->key,db->CreateVBO((*sp)->value->data)); + primitive->Set((*sp)->key,db->CreateVBO((*sp)->value->vad)); ++sp; }