hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed to AccessVAD from CreateCADA

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-05-29 21:43:39 +08:00
parent ed5aac2a9d
commit 222ff2961f
5 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCore

@ -1 +1 @@
Subproject commit 6155612605a079c84b666314c48e1704d2600554
Subproject commit 4d58256a3d5caec9258d0059996dbed5627ff02a

2
CMSceneGraph

@ -1 +1 @@
Subproject commit 4d21058a12ed1ba1148436f1f0d550150251ff3e
Subproject commit 8fd176b8fa8ca605a4b80e766c06c48ce5b1aa85

8
inc/hgl/graph/PrimitiveCreater.h
View File

@ -54,7 +54,7 @@ namespace hgl
VAD * CreateVAD(const AnsiString &name); ///<创建一个顶点属性缓冲区
template<typename T>
T * CreateVADA(const AnsiString &name) ///<创建一个顶点属性缓冲区以及访问器
T * AccessVAD(const AnsiString &name) ///<创建一个顶点属性缓冲区以及访问器
{
const VkFormat format=vil->GetVulkanFormat(name);
@ -66,11 +66,11 @@ namespace hgl
if(!vad)
return(nullptr);
T *vada=T::Create(vad);
T *access=T::Create(vad);
vada->Begin();
access->Begin();
return vada;
return access;
}
bool WriteVAD(const AnsiString &name,const void *data,const uint32_t bytes); ///<直接写入顶点属性数据

70
src/SceneGraph/InlineGeometry.cpp
View File

@ -21,7 +21,7 @@ namespace hgl
if(!rc.Init(4))
return(nullptr);
AutoDelete<VB2f> vertex=rc.CreateVADA<VB2f>(VAN::Position);
AutoDelete<VB2f> vertex=rc.AccessVAD<VB2f>(VAN::Position);
if(!vertex)
return(nullptr);
@ -49,7 +49,7 @@ namespace hgl
if(!rc.Init(4))
return(nullptr);
AutoDelete<VB2f> vertex=rc.CreateVADA<VB2f>(VAN::Position);
AutoDelete<VB2f> vertex=rc.AccessVAD<VB2f>(VAN::Position);
vertex->WriteRectFan(rci->scope);
}
@ -63,7 +63,7 @@ namespace hgl
if(!rc.Init(rci->round_per*4))
return(nullptr);
AutoDelete<VB2f> vertex=rc.CreateVADA<VB2f>(VAN::Position);
AutoDelete<VB2f> vertex=rc.AccessVAD<VB2f>(VAN::Position);
Vector2f *coord=new Vector2f[rci->round_per];
@ -131,8 +131,8 @@ namespace hgl
if(!rc.Init(cci->field_count))return(nullptr);
}
AutoDelete<VB2f> vertex=rc.CreateVADA<VB2f>(VAN::Position);
AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::Color);
AutoDelete<VB2f> vertex=rc.AccessVAD<VB2f>(VAN::Position);
AutoDelete<VB4f> color=rc.AccessVAD<VB4f>(VAN::Color);
if(!vertex)
return(nullptr);
@ -169,7 +169,7 @@ namespace hgl
if(!rc.Init(((pgci->step.x+1)+(pgci->step.y+1))*2))
return(nullptr);
AutoDelete<VB3f> vertex=rc.CreateVADA<VB3f>(VAN::Position);
AutoDelete<VB3f> vertex=rc.AccessVAD<VB3f>(VAN::Position);
for(uint row=0;row<=pgci->step.x;row++)
{
float pos=float(row)/float(pgci->step.x);
@ -186,7 +186,7 @@ namespace hgl
to(pgci->coord[0],pgci->coord[3],pos));
}
AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::Color);
AutoDelete<VB4f> color=rc.AccessVAD<VB4f>(VAN::Color);
if(color)
{
for(uint row=0;row<=pgci->step.x;row++)
@ -224,19 +224,19 @@ namespace hgl
rc.WriteVAD(VAN::Position,xy_vertices,sizeof(xy_vertices));
{
AutoDelete<VB3f> normal=rc.CreateVADA<VB3f>(VAN::Normal);
AutoDelete<VB3f> normal=rc.AccessVAD<VB3f>(VAN::Normal);
if(normal)normal->RepeatWrite(xy_normal,4);
}
{
AutoDelete<VB3f> tangent=rc.CreateVADA<VB3f>(VAN::Tangent);
AutoDelete<VB3f> tangent=rc.AccessVAD<VB3f>(VAN::Tangent);
tangent->RepeatWrite(xy_tangent,4);
}
{
AutoDelete<VB2f> tex_coord=rc.CreateVADA<VB2f>(VAN::TexCoord);
AutoDelete<VB2f> tex_coord=rc.AccessVAD<VB2f>(VAN::TexCoord);
if(tex_coord)
{
@ -323,7 +323,7 @@ namespace hgl
{
RANGE_CHECK_RETURN_NULLPTR(cci->color_type);
AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::Color);
AutoDelete<VB4f> color=rc.AccessVAD<VB4f>(VAN::Color);
if(color)
{
@ -461,10 +461,10 @@ namespace hgl
if(!rc.Init(numberVertices))
return(nullptr);
AutoDelete<VB3f> vertex=rc.CreateVADA<VB3f>(VAN::Position);
AutoDelete<VB3f> normal=rc.CreateVADA<VB3f>(VAN::Normal);
AutoDelete<VB3f> tangent=rc.CreateVADA<VB3f>(VAN::Tangent);
AutoDelete<VB2f> tex_coord=rc.CreateVADA<VB2f>(VAN::TexCoord);
AutoDelete<VB3f> vertex=rc.AccessVAD<VB3f>(VAN::Position);
AutoDelete<VB3f> normal=rc.AccessVAD<VB3f>(VAN::Normal);
AutoDelete<VB3f> tangent=rc.AccessVAD<VB3f>(VAN::Tangent);
AutoDelete<VB2f> tex_coord=rc.AccessVAD<VB2f>(VAN::TexCoord);
float *vp=vertex->Get();
float *np=normal?normal->Get():nullptr;
@ -542,10 +542,10 @@ namespace hgl
if(!rc.Init(numberVertices))
return(nullptr);
AutoDelete<VB3f> vertex=rc.CreateVADA<VB3f>(VAN::Position);
AutoDelete<VB3f> normal=rc.CreateVADA<VB3f>(VAN::Normal);
AutoDelete<VB3f> tangent=rc.CreateVADA<VB3f>(VAN::Tangent);
AutoDelete<VB2f> tex_coord=rc.CreateVADA<VB2f>(VAN::TexCoord);
AutoDelete<VB3f> vertex=rc.AccessVAD<VB3f>(VAN::Position);
AutoDelete<VB3f> normal=rc.AccessVAD<VB3f>(VAN::Normal);
AutoDelete<VB3f> tangent=rc.AccessVAD<VB3f>(VAN::Tangent);
AutoDelete<VB2f> tex_coord=rc.AccessVAD<VB2f>(VAN::TexCoord);
float *vp=vertex->Get();
float *np=normal?normal->Get():nullptr;
@ -679,10 +679,10 @@ namespace hgl
if(!rc.Init(numberVertices))
return(nullptr);
AutoDelete<VB3f> vertex=rc.CreateVADA<VB3f>(VAN::Position);
AutoDelete<VB3f> normal=rc.CreateVADA<VB3f>(VAN::Normal);
AutoDelete<VB3f> tangent=rc.CreateVADA<VB3f>(VAN::Tangent);
AutoDelete<VB2f> tex_coord=rc.CreateVADA<VB2f>(VAN::TexCoord);
AutoDelete<VB3f> vertex=rc.AccessVAD<VB3f>(VAN::Position);
AutoDelete<VB3f> normal=rc.AccessVAD<VB3f>(VAN::Normal);
AutoDelete<VB3f> tangent=rc.AccessVAD<VB3f>(VAN::Tangent);
AutoDelete<VB2f> tex_coord=rc.AccessVAD<VB2f>(VAN::TexCoord);
float *vp=vertex->Get();
float *np=normal?normal->Get():nullptr;
@ -814,10 +814,10 @@ namespace hgl
if (cci->numberSlices < 3 || numberVertices > GLUS_MAX_VERTICES || numberIndices > GLUS_MAX_INDICES)
return nullptr;
AutoDelete<VB3f> vertex=rc.CreateVADA<VB3f>(VAN::Position);
AutoDelete<VB3f> normal=rc.CreateVADA<VB3f>(VAN::Normal);
AutoDelete<VB3f> tangent=rc.CreateVADA<VB3f>(VAN::Tangent);
AutoDelete<VB2f> tex_coord=rc.CreateVADA<VB2f>(VAN::TexCoord);
AutoDelete<VB3f> vertex=rc.AccessVAD<VB3f>(VAN::Position);
AutoDelete<VB3f> normal=rc.AccessVAD<VB3f>(VAN::Normal);
AutoDelete<VB3f> tangent=rc.AccessVAD<VB3f>(VAN::Tangent);
AutoDelete<VB2f> tex_coord=rc.AccessVAD<VB2f>(VAN::TexCoord);
float *vp=vertex->Get();
float *np=normal?normal->Get():nullptr;
@ -1036,10 +1036,10 @@ namespace hgl
if (cci->numberSlices < 3 || cci->numberStacks < 1 || numberVertices > GLUS_MAX_VERTICES || numberIndices > GLUS_MAX_INDICES)
return nullptr;
AutoDelete<VB3f> vertex=rc.CreateVADA<VB3f>(VAN::Position);
AutoDelete<VB3f> normal=rc.CreateVADA<VB3f>(VAN::Normal);
AutoDelete<VB3f> tangent=rc.CreateVADA<VB3f>(VAN::Tangent);
AutoDelete<VB2f> tex_coord=rc.CreateVADA<VB2f>(VAN::TexCoord);
AutoDelete<VB3f> vertex=rc.AccessVAD<VB3f>(VAN::Position);
AutoDelete<VB3f> normal=rc.AccessVAD<VB3f>(VAN::Normal);
AutoDelete<VB3f> tangent=rc.AccessVAD<VB3f>(VAN::Tangent);
AutoDelete<VB2f> tex_coord=rc.AccessVAD<VB2f>(VAN::TexCoord);
float *vp=vertex->Get();
float *np=normal?normal->Get():nullptr;
@ -1150,8 +1150,8 @@ namespace hgl
if(!rc.Init(6))
return(nullptr);
AutoDelete<VB3f> vertex=rc.CreateVADA<VB3f>(VAN::Position);
AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::Color);
AutoDelete<VB3f> vertex=rc.AccessVAD<VB3f>(VAN::Position);
AutoDelete<VB4f> color=rc.AccessVAD<VB4f>(VAN::Color);
if(!vertex||!color)
return(nullptr);
@ -1195,7 +1195,7 @@ namespace hgl
if(!rc.Init(8))
return(nullptr);
AutoDelete<VB3f> vertex=rc.CreateVADA<VB3f>(VAN::Position);
AutoDelete<VB3f> vertex=rc.AccessVAD<VB3f>(VAN::Position);
if(!vertex)return(nullptr);
@ -1205,7 +1205,7 @@ namespace hgl
{
RANGE_CHECK_RETURN_NULLPTR(cci->color_type);
AutoDelete<VB4f> color=rc.CreateVADA<VB4f>(VAN::Color);
AutoDelete<VB4f> color=rc.AccessVAD<VB4f>(VAN::Color);
if(color)
{

4
src/SceneGraph/font/TextLayout.cpp
View File

@ -162,8 +162,8 @@ namespace hgl
// if(!rc->Init(draw_chars_count))
// return(-4);
// vertex =rc->CreateVADA<VB4f>(VAN::Position);
// tex_coord =rc->CreateVADA<VB4f>(VAN::TexCoord);
// vertex =rc->AccessVAD<VB4f>(VAN::Position);
// tex_coord =rc->AccessVAD<VB4f>(VAN::TexCoord);
// if(!vertex||!tex_coord)
// return(-5);