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

added GetVABMap and GetIBMap in Primitive

Browse Source
This commit is contained in:
hyzboy 2024-06-12 02:07:54 +08:00
parent 7b0a185a45
commit 2efb9c83bf
9 changed files with 150 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ public: //顶点缓冲区
const uint32_t GetVertexCount()const{ return vertices_number; } ///<取得顶点数量 const uint32_t GetVertexCount()const{ return vertices_number; } ///<取得顶点数量
VABMap * MapVAB (const AnsiString &name,const VkFormat format=VK_FORMAT_UNDEFINED); VABMap * GetVABMap (const AnsiString &name,const VkFormat format=VK_FORMAT_UNDEFINED);
bool WriteVAB (const AnsiString &name,const VkFormat format,const void *data); ///<直接写入顶点属性数据 bool WriteVAB (const AnsiString &name,const VkFormat format,const void *data); ///<直接写入顶点属性数据
@ -65,7 +65,7 @@ public: //索引缓冲区
const IndexType GetIndexType()const{return index_type;} ///<取得索引类型 const IndexType GetIndexType()const{return index_type;} ///<取得索引类型
const uint32_t GetIndexCount()const{return index_number;} ///<取得索引数量 const uint32_t GetIndexCount()const{return index_number;} ///<取得索引数量
IBMap * MapIBO(); IBMap * GetIBMap();
bool WriteIBO(const void *data,const uint32_t count); bool WriteIBO(const void *data,const uint32_t count);

3
inc/hgl/graph/VK.h
View File

@ -62,6 +62,9 @@ using VAB=VertexAttribBuffer;
class IndexBuffer; class IndexBuffer;
class VABMap;
class IBMap;
class GPUCmdBuffer; class GPUCmdBuffer;
class RenderCmdBuffer; class RenderCmdBuffer;
class TextureCmdBuffer; class TextureCmdBuffer;

4
inc/hgl/graph/VKPrimitive.h
View File

@ -6,6 +6,7 @@
#include<hgl/graph/VK.h> #include<hgl/graph/VK.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
/** /**
* 原始图元数据访问接口<br> * 原始图元数据访问接口<br>
* Primitive的存为是为了屏蔽PrimitiveData的初始化之类的访问接口，以便于更好的管理和使用 * Primitive的存为是为了屏蔽PrimitiveData的初始化之类的访问接口，以便于更好的管理和使用
@ -37,10 +38,13 @@ public:
VAB * GetVAB (const int); VAB * GetVAB (const int);
VAB * GetVAB (const AnsiString &name){return GetVAB(GetVABIndex(name));} VAB * GetVAB (const AnsiString &name){return GetVAB(GetVABIndex(name));}
const int32_t GetVertexOffset ()const; ///<取得顶点偏移(注意是顶点不是字节) const int32_t GetVertexOffset ()const; ///<取得顶点偏移(注意是顶点不是字节)
VABMap * GetVABMap (const int); ///<取得VAB映射器
VABMap * GetVABMap (const AnsiString &name){return GetVABMap(GetVABIndex(name));}
const uint32_t GetIndexCount ()const; const uint32_t GetIndexCount ()const;
IndexBuffer * GetIBO (); IndexBuffer * GetIBO ();
const uint32_t GetFirstIndex ()const; ///<取得第一个索引 const uint32_t GetFirstIndex ()const; ///<取得第一个索引
IBMap * GetIBMap (); ///<取得索引缓冲区映射器
VertexDataManager * GetVDM (); ///<取得顶点数据管理器 VertexDataManager * GetVDM (); ///<取得顶点数据管理器

87
inc/hgl/graph/VKVertexAttribBuffer.h
View File

@ -68,15 +68,24 @@ template<typename T> class VABRawMap
public: public:
VABRawMap(VABMap *map,const VkFormat check_format=VK_FORMAT_UNDEFINED) VABRawMap(VABMap *map,const VkFormat check_format=VK_FORMAT_UNDEFINED,bool now_map=true)
{ {
vab_map=map; vab_map=map;
map_ptr=nullptr; map_ptr=nullptr;
if(vab_map) if(vab_map)
{
if(check_format==VK_FORMAT_UNDEFINED if(check_format==VK_FORMAT_UNDEFINED
||check_format==vab_map->GetFormat()) ||check_format==vab_map->GetFormat())
map_ptr=(T *)(vab_map->Map()); {
if(now_map)
map_ptr=(T *)(vab_map->Map());
}
else
{
vab_map=nullptr;
}
}
} }
~VABRawMap() ~VABRawMap()
@ -87,6 +96,26 @@ public:
const bool IsValid()const{ return vab_map?vab_map->IsValid():false; } const bool IsValid()const{ return vab_map?vab_map->IsValid():false; }
T *Map()
{
if(!vab_map)
return(nullptr);
if(!map_ptr)
map_ptr=(T *)(vab_map->Map());
return map_ptr;
}
void Unmap()
{
if(vab_map)
{
if(map_ptr)
vab_map->Unmap();
}
}
operator T *(){ return map_ptr; } operator T *(){ return map_ptr; }
T *operator->(){ return map_ptr; } T *operator->(){ return map_ptr; }
};//template<typename T> class VABRawMap };//template<typename T> class VABRawMap
@ -111,14 +140,21 @@ template<typename T> class VABFormatMap
public: public:
VABFormatMap(VABMap *map) VABFormatMap(VABMap *map,bool now_map=true)
{ {
vab_map=map; vab_map=map;
if(vab_map&&vab_map->GetFormat()==T::GetVulkanFormat()) if(vab_map&&vab_map->GetFormat()==T::GetVulkanFormat())
{ {
map_ptr=T::Create(vab_map->GetCount(),vab_map->Map()); if(now_map)
map_ptr->Begin(); {
map_ptr=T::Create(vab_map->GetCount(),vab_map->Map());
map_ptr->Begin();
}
else
{
map_ptr=T::Create(vab_map->GetCount(),nullptr);
}
} }
else else
map_ptr=nullptr; map_ptr=nullptr;
@ -133,15 +169,48 @@ public:
} }
} }
const bool IsValid()const{ return map_ptr; } const bool IsValid()const{ return map_ptr?map_ptr->IsValid():false; }
T *Map()
{
if(!vab_map)
return(nullptr);
if(!map_ptr)
{
map_ptr=T::Create(vab_map->GetCount(),vab_map->Map());
}
else
{
if(!map_ptr->IsValid())
map_ptr->SetData(vab_map->Map());
}
map_ptr->Begin();
return map_ptr;
}
void Unmap()
{
if(vab_map)
{
if(map_ptr&&map_ptr->IsValid())
{
vab_map->Unmap();
map_ptr->SetData(nullptr);
}
}
}
void Restart() void Restart()
{ {
if(map_ptr) return Map();
vab_map->Begin();
} }
T *operator->(){ return map_ptr; } T *operator->()
{
return map_ptr;
}
};//template<typename T> class VABFormatMap };//template<typename T> class VABFormatMap
typedef VABFormatMap<VB1i8> VABMap1i8 ,VABMap1b; typedef VABFormatMap<VB1i8> VABMap1i8 ,VABMap1b;

11
inc/hgl/graph/VertexAttribDataAccess.h
View File

@ -44,6 +44,17 @@ namespace hgl
virtual ~VertexAttribDataAccess()=default; virtual ~VertexAttribDataAccess()=default;
void SetData(T *_data)
{
data =_data;
data_end=_data+count*C;
}
const bool IsValid()const
{
return data;
}
void Write(const T *ptr) void Write(const T *ptr)
{ {
if(!ptr)return; if(!ptr)return;

76
src/SceneGraph/InlineGeometry.cpp
View File

@ -20,7 +20,7 @@ namespace hgl
if(!pc->Init("Rectangle",4,0)) if(!pc->Init("Rectangle",4,0))
return(nullptr); return(nullptr);
VABMap2f vertex(pc->MapVAB(VAN::Position)); VABMap2f vertex(pc->GetVABMap(VAN::Position));
if(!vertex.IsValid()) if(!vertex.IsValid())
return(nullptr); return(nullptr);
@ -48,7 +48,7 @@ namespace hgl
if(!pc->Init("RoundRectangle",4,0)) if(!pc->Init("RoundRectangle",4,0))
return(nullptr); return(nullptr);
VABMap2f vertex(pc->MapVAB(VAN::Position)); VABMap2f vertex(pc->GetVABMap(VAN::Position));
vertex->WriteRectFan(rci->scope); vertex->WriteRectFan(rci->scope);
} }
@ -62,7 +62,7 @@ namespace hgl
if(!pc->Init("RoundRectangle",rci->round_per*4,8)) if(!pc->Init("RoundRectangle",rci->round_per*4,8))
return(nullptr); return(nullptr);
VABMap2f vertex(pc->MapVAB(VAN::Position)); VABMap2f vertex(pc->GetVABMap(VAN::Position));
Vector2f *coord=new Vector2f[rci->round_per]; Vector2f *coord=new Vector2f[rci->round_per];
@ -133,8 +133,8 @@ namespace hgl
if(!pc->Init("Circle",vertex_count,0))return(nullptr); if(!pc->Init("Circle",vertex_count,0))return(nullptr);
VABMap2f vertex(pc->MapVAB(VAN::Position)); VABMap2f vertex(pc->GetVABMap(VAN::Position));
VABMap4f color(pc->MapVAB(VAN::Color)); VABMap4f color(pc->GetVABMap(VAN::Color));
if(!vertex.IsValid()) if(!vertex.IsValid())
return(nullptr); return(nullptr);
@ -169,7 +169,7 @@ namespace hgl
if(!pc->Init("PlaneGrid",((pgci->grid_size.Width()+1)+(pgci->grid_size.Height()+1))*2,0)) if(!pc->Init("PlaneGrid",((pgci->grid_size.Width()+1)+(pgci->grid_size.Height()+1))*2,0))
return(nullptr); return(nullptr);
VABMap2f vertex(pc->MapVAB(VAN::Position)); VABMap2f vertex(pc->GetVABMap(VAN::Position));
if(!vertex.IsValid()) if(!vertex.IsValid())
return(nullptr); return(nullptr);
@ -192,7 +192,7 @@ namespace hgl
Vector2f(left+col,bottom)); Vector2f(left+col,bottom));
} }
VABMap1f lum(pc->MapVAB(VAN::Luminance)); VABMap1f lum(pc->GetVABMap(VAN::Luminance));
if(lum.IsValid()) if(lum.IsValid())
{ {
@ -232,21 +232,21 @@ namespace hgl
return(nullptr); return(nullptr);
{ {
VABMap3f normal(pc->MapVAB(VAN::Normal)); VABMap3f normal(pc->GetVABMap(VAN::Normal));
if(normal.IsValid()) if(normal.IsValid())
normal->RepeatWrite(xy_normal,4); normal->RepeatWrite(xy_normal,4);
} }
{ {
VABMap3f tangent(pc->MapVAB(VAN::Tangent)); VABMap3f tangent(pc->GetVABMap(VAN::Tangent));
if(tangent.IsValid()) if(tangent.IsValid())
tangent->RepeatWrite(xy_tangent,4); tangent->RepeatWrite(xy_tangent,4);
} }
{ {
VABMap2f tex_coord(pc->MapVAB(VAN::TexCoord)); VABMap2f tex_coord(pc->GetVABMap(VAN::TexCoord));
if(tex_coord.IsValid()) if(tex_coord.IsValid())
tex_coord->Write(xy_tex_coord,4); tex_coord->Write(xy_tex_coord,4);
@ -332,7 +332,7 @@ namespace hgl
{ {
RANGE_CHECK_RETURN_NULLPTR(cci->color_type); RANGE_CHECK_RETURN_NULLPTR(cci->color_type);
VABMap4f color(pc->MapVAB(VAN::Color)); VABMap4f color(pc->GetVABMap(VAN::Color));
if(color.IsValid()) if(color.IsValid())
{ {
@ -360,7 +360,7 @@ namespace hgl
template<typename T> template<typename T>
void CreateSphereIndices(PrimitiveCreater *pc,uint numberParallels,const uint numberSlices) void CreateSphereIndices(PrimitiveCreater *pc,uint numberParallels,const uint numberSlices)
{ {
IBTypeMap<T> ib_map(pc->MapIBO()); IBTypeMap<T> ib_map(pc->GetIBMap());
T *tp=ib_map; T *tp=ib_map;
for (uint i = 0; i < numberParallels; i++) for (uint i = 0; i < numberParallels; i++)
@ -473,10 +473,10 @@ namespace hgl
if(!pc->Init("Sphere",numberVertices,numberIndices)) if(!pc->Init("Sphere",numberVertices,numberIndices))
return(nullptr); return(nullptr);
VABMapFloat vertex (pc->MapVAB(VAN::Position),VF_V3F); VABMapFloat vertex (pc->GetVABMap(VAN::Position),VF_V3F);
VABMapFloat normal (pc->MapVAB(VAN::Normal),VF_V3F); VABMapFloat normal (pc->GetVABMap(VAN::Normal),VF_V3F);
VABMapFloat tangent (pc->MapVAB(VAN::Tangent),VF_V3F); VABMapFloat tangent (pc->GetVABMap(VAN::Tangent),VF_V3F);
VABMapFloat tex_coord(pc->MapVAB(VAN::TexCoord),VF_V2F); VABMapFloat tex_coord(pc->GetVABMap(VAN::TexCoord),VF_V2F);
float *vp=vertex; float *vp=vertex;
float *np=normal; float *np=normal;
@ -562,10 +562,10 @@ namespace hgl
if(!pc->Init("Dome",numberVertices,numberIndices)) if(!pc->Init("Dome",numberVertices,numberIndices))
return(nullptr); return(nullptr);
VABMapFloat vertex (pc->MapVAB(VAN::Position),VF_V3F); VABMapFloat vertex (pc->GetVABMap(VAN::Position),VF_V3F);
VABMapFloat normal (pc->MapVAB(VAN::Normal),VF_V3F); VABMapFloat normal (pc->GetVABMap(VAN::Normal),VF_V3F);
VABMapFloat tangent (pc->MapVAB(VAN::Tangent),VF_V3F); VABMapFloat tangent (pc->GetVABMap(VAN::Tangent),VF_V3F);
VABMapFloat tex_coord(pc->MapVAB(VAN::TexCoord),VF_V2F); VABMapFloat tex_coord(pc->GetVABMap(VAN::TexCoord),VF_V2F);
float *vp=vertex; float *vp=vertex;
float *np=normal; float *np=normal;
@ -637,7 +637,7 @@ namespace hgl
template<typename T> template<typename T>
void CreateTorusIndices(PrimitiveCreater *pc,uint numberSlices,uint numberStacks) void CreateTorusIndices(PrimitiveCreater *pc,uint numberSlices,uint numberStacks)
{ {
IBTypeMap<T> ib_map(pc->MapIBO()); IBTypeMap<T> ib_map(pc->GetIBMap());
T *tp=ib_map; T *tp=ib_map;
// loop counters // loop counters
@ -710,10 +710,10 @@ namespace hgl
if(!pc->Init("Torus",numberVertices,numberIndices)) if(!pc->Init("Torus",numberVertices,numberIndices))
return(nullptr); return(nullptr);
VABMapFloat vertex (pc->MapVAB(VAN::Position),VF_V3F); VABMapFloat vertex (pc->GetVABMap(VAN::Position),VF_V3F);
VABMapFloat normal (pc->MapVAB(VAN::Normal),VF_V3F); VABMapFloat normal (pc->GetVABMap(VAN::Normal),VF_V3F);
VABMapFloat tangent (pc->MapVAB(VAN::Tangent),VF_V3F); VABMapFloat tangent (pc->GetVABMap(VAN::Tangent),VF_V3F);
VABMapFloat tex_coord(pc->MapVAB(VAN::TexCoord),VF_V2F); VABMapFloat tex_coord(pc->GetVABMap(VAN::TexCoord),VF_V2F);
float *vp=vertex; float *vp=vertex;
float *np=normal; float *np=normal;
@ -788,7 +788,7 @@ namespace hgl
template<typename T> template<typename T>
void CreateCylinderIndices(PrimitiveCreater *pc,const uint numberSlices) void CreateCylinderIndices(PrimitiveCreater *pc,const uint numberSlices)
{ {
IBTypeMap<T> ib_map(pc->MapIBO()); IBTypeMap<T> ib_map(pc->GetIBMap());
T *tp=ib_map; T *tp=ib_map;
uint i; uint i;
@ -852,10 +852,10 @@ namespace hgl
if (cci->numberSlices < 3 || numberVertices > GLUS_MAX_VERTICES || numberIndices > GLUS_MAX_INDICES) if (cci->numberSlices < 3 || numberVertices > GLUS_MAX_VERTICES || numberIndices > GLUS_MAX_INDICES)
return nullptr; return nullptr;
VABMapFloat vertex (pc->MapVAB(VAN::Position),VF_V3F); VABMapFloat vertex (pc->GetVABMap(VAN::Position),VF_V3F);
VABMapFloat normal (pc->MapVAB(VAN::Normal),VF_V3F); VABMapFloat normal (pc->GetVABMap(VAN::Normal),VF_V3F);
VABMapFloat tangent (pc->MapVAB(VAN::Tangent),VF_V3F); VABMapFloat tangent (pc->GetVABMap(VAN::Tangent),VF_V3F);
VABMapFloat tex_coord(pc->MapVAB(VAN::TexCoord),VF_V2F); VABMapFloat tex_coord(pc->GetVABMap(VAN::TexCoord),VF_V2F);
float *vp=vertex; float *vp=vertex;
float *np=normal; float *np=normal;
@ -1025,7 +1025,7 @@ namespace hgl
template<typename T> template<typename T>
void CreateConeIndices(PrimitiveCreater *pc,const uint numberSlices,const uint numberStacks) void CreateConeIndices(PrimitiveCreater *pc,const uint numberSlices,const uint numberStacks)
{ {
IBTypeMap<T> ib_map(pc->MapIBO()); IBTypeMap<T> ib_map(pc->GetIBMap());
T *tp=ib_map; T *tp=ib_map;
// Bottom // Bottom
@ -1082,10 +1082,10 @@ namespace hgl
if (cci->numberSlices < 3 || cci->numberStacks < 1 || numberVertices > GLUS_MAX_VERTICES || numberIndices > GLUS_MAX_INDICES) if (cci->numberSlices < 3 || cci->numberStacks < 1 || numberVertices > GLUS_MAX_VERTICES || numberIndices > GLUS_MAX_INDICES)
return nullptr; return nullptr;
VABMapFloat vertex (pc->MapVAB(VAN::Position),VF_V3F); VABMapFloat vertex (pc->GetVABMap(VAN::Position),VF_V3F);
VABMapFloat normal (pc->MapVAB(VAN::Normal),VF_V3F); VABMapFloat normal (pc->GetVABMap(VAN::Normal),VF_V3F);
VABMapFloat tangent (pc->MapVAB(VAN::Tangent),VF_V3F); VABMapFloat tangent (pc->GetVABMap(VAN::Tangent),VF_V3F);
VABMapFloat tex_coord(pc->MapVAB(VAN::TexCoord),VF_V2F); VABMapFloat tex_coord(pc->GetVABMap(VAN::TexCoord),VF_V2F);
float *vp=vertex; float *vp=vertex;
float *np=normal; float *np=normal;
@ -1204,8 +1204,8 @@ namespace hgl
if(!pc->Init("Axis",6,0)) if(!pc->Init("Axis",6,0))
return(nullptr); return(nullptr);
VABMap3f vertex(pc->MapVAB(VAN::Position)); VABMap3f vertex(pc->GetVABMap(VAN::Position));
VABMap4f color(pc->MapVAB(VAN::Color)); VABMap4f color(pc->GetVABMap(VAN::Color));
if(!vertex.IsValid()||!color.IsValid()) if(!vertex.IsValid()||!color.IsValid())
return(nullptr); return(nullptr);
@ -1256,7 +1256,7 @@ namespace hgl
{ {
RANGE_CHECK_RETURN_NULLPTR(cci->color_type); RANGE_CHECK_RETURN_NULLPTR(cci->color_type);
VABMap4f color(pc->MapVAB(VAN::Color)); VABMap4f color(pc->GetVABMap(VAN::Color));
if(color.IsValid()) if(color.IsValid())
{ {

6
src/SceneGraph/PrimitiveCreater.cpp
View File

@ -154,7 +154,7 @@ const int PrimitiveCreater::InitVAB(const AnsiString &name,const VkFormat format
return(vab_index); return(vab_index);
} }
VABMap *PrimitiveCreater::MapVAB(const AnsiString &name,const VkFormat format) VABMap *PrimitiveCreater::GetVABMap(const AnsiString &name,const VkFormat format)
{ {
const int vab_index=InitVAB(name,format,nullptr); const int vab_index=InitVAB(name,format,nullptr);
@ -171,12 +171,12 @@ bool PrimitiveCreater::WriteVAB(const AnsiString &name,const VkFormat format,con
return InitVAB(name,format,data)>0; return InitVAB(name,format,data)>0;
} }
IBMap *PrimitiveCreater::MapIBO() IBMap *PrimitiveCreater::GetIBMap()
{ {
if(!prim_data) if(!prim_data)
return(nullptr); return(nullptr);
return prim_data->MapIBO(); return prim_data->GetIBMap();
} }
bool PrimitiveCreater::WriteIBO(const void *data,const uint32_t count) bool PrimitiveCreater::WriteIBO(const void *data,const uint32_t count)

10
src/SceneGraph/Vulkan/VKPrimitive.cpp
View File

@ -66,6 +66,11 @@ const int32_t Primitive::GetVertexOffset()const
return prim_data->GetVertexOffset(); return prim_data->GetVertexOffset();
} }
VABMap *Primitive::GetVABMap(const int vab_index)
{
return prim_data->GetVABMap(vab_index);
}
const uint32_t Primitive::GetIndexCount()const const uint32_t Primitive::GetIndexCount()const
{ {
return prim_data->GetIndexCount(); return prim_data->GetIndexCount();
@ -81,6 +86,11 @@ const uint32_t Primitive::GetFirstIndex()const
return prim_data->GetFirstIndex(); return prim_data->GetFirstIndex();
} }
IBMap *Primitive::GetIBMap()
{
return prim_data->GetIBMap();
}
VertexDataManager *Primitive::GetVDM() VertexDataManager *Primitive::GetVDM()
{ {
return prim_data->GetVDM(); return prim_data->GetVDM();

2
src/SceneGraph/Vulkan/VKPrimitiveData.h
View File

@ -56,7 +56,7 @@ public:
IndexBuffer * InitIBO(const uint32_t index_count,IndexType it); IndexBuffer * InitIBO(const uint32_t index_count,IndexType it);
IndexBuffer * GetIBO (){return ibo;} IndexBuffer * GetIBO (){return ibo;}
IBMap * MapIBO (){return &ibo_map;} IBMap * GetIBMap (){return &ibo_map;}
uint32_t GetIndexCount ()const{return index_count;} uint32_t GetIndexCount ()const{return index_count;}
virtual int32_t GetVertexOffset ()const=0; ///<取得顶点偏移(注意是顶点不是字节) virtual int32_t GetVertexOffset ()const=0; ///<取得顶点偏移(注意是顶点不是字节)