renamed to "vad" from "data" in PrimitiveVertexBuffer
This commit is contained in:
parent
3c22b48f3c
commit
d4c1dd312e
@ -17,14 +17,14 @@ namespace hgl
|
|||||||
{
|
{
|
||||||
AnsiString name;
|
AnsiString name;
|
||||||
uint binding;
|
uint binding;
|
||||||
VAD * data =nullptr;
|
VAD * vad =nullptr;
|
||||||
VBO * vbo =nullptr;
|
VBO * vbo =nullptr;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
~PrimitiveVertexBuffer()
|
~PrimitiveVertexBuffer()
|
||||||
{
|
{
|
||||||
SAFE_CLEAR(data);
|
SAFE_CLEAR(vad);
|
||||||
}
|
}
|
||||||
};//struct PrimitiveVertexBuffer
|
};//struct PrimitiveVertexBuffer
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ namespace hgl
|
|||||||
PrimitiveVertexBuffer *pvb;
|
PrimitiveVertexBuffer *pvb;
|
||||||
|
|
||||||
if(vbo_map.Get(name,pvb))
|
if(vbo_map.Get(name,pvb))
|
||||||
return pvb->data;
|
return pvb->vad;
|
||||||
|
|
||||||
VAD *vad=hgl::graph::CreateVertexAttribData(vertices_number,vif);
|
VAD *vad=hgl::graph::CreateVertexAttribData(vertices_number,vif);
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ namespace hgl
|
|||||||
|
|
||||||
pvb=new PrimitiveVertexBuffer;
|
pvb=new PrimitiveVertexBuffer;
|
||||||
|
|
||||||
pvb->data =vad;
|
pvb->vad =vad;
|
||||||
pvb->name =name;
|
pvb->name =name;
|
||||||
pvb->binding=vif->binding;
|
pvb->binding=vif->binding;
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ namespace hgl
|
|||||||
|
|
||||||
vbo_map.Add(name,pvb);
|
vbo_map.Add(name,pvb);
|
||||||
|
|
||||||
return pvb->data;
|
return pvb->vad;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool PrimitiveCreater::WriteVAD(const AnsiString &name,const void *data,const uint32_t bytes)
|
bool PrimitiveCreater::WriteVAD(const AnsiString &name,const void *data,const uint32_t bytes)
|
||||||
@ -78,7 +78,7 @@ namespace hgl
|
|||||||
|
|
||||||
pvb=new PrimitiveVertexBuffer;
|
pvb=new PrimitiveVertexBuffer;
|
||||||
|
|
||||||
pvb->data =nullptr;
|
pvb->vad =nullptr;
|
||||||
pvb->name =name;
|
pvb->name =name;
|
||||||
pvb->binding=vif->binding;
|
pvb->binding=vif->binding;
|
||||||
|
|
||||||
@ -104,7 +104,7 @@ namespace hgl
|
|||||||
if((*sp)->value->vbo)
|
if((*sp)->value->vbo)
|
||||||
primitive->Set((*sp)->key,(*sp)->value->vbo);
|
primitive->Set((*sp)->key,(*sp)->value->vbo);
|
||||||
else
|
else
|
||||||
primitive->Set((*sp)->key,db->CreateVBO((*sp)->value->data));
|
primitive->Set((*sp)->key,db->CreateVBO((*sp)->value->vad));
|
||||||
|
|
||||||
++sp;
|
++sp;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user