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

upgrade many value name.

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2022-06-24 18:00:22 +08:00
parent 6e7144ffab
commit 43c60c16e2
18 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
example/2dVector/line.cpp
View File

@ -113,12 +113,12 @@ private:
bool InitVBO() bool InitVBO()
{ {
Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT); Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false); if(!primitive)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline);
return(true); return(true);
} }

8
example/2dVector/roundbox.cpp
View File

@ -129,12 +129,12 @@ private:
bool InitVBO() bool InitVBO()
{ {
Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT); Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false); if(!primitive)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V4I16,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V4I16,VERTEX_COUNT,position_data)))return(false);
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline);
return(true); return(true);
} }

12
example/Vulkan/DrawTile.cpp
View File

@ -40,7 +40,7 @@ private:
Sampler * sampler =nullptr; Sampler * sampler =nullptr;
MaterialInstance * material_instance =nullptr; MaterialInstance * material_instance =nullptr;
Primitive * render_obj =nullptr; Primitive * primitive =nullptr;
RenderableInstance *render_instance =nullptr; RenderableInstance *render_instance =nullptr;
Pipeline * pipeline =nullptr; Pipeline * pipeline =nullptr;
@ -174,13 +174,13 @@ private:
{ {
const uint tile_count=tile_list.GetCount(); const uint tile_count=tile_list.GetCount();
render_obj=db->CreatePrimitive(tile_count); primitive=db->CreatePrimitive(tile_count);
if(!render_obj)return(false); if(!primitive)return(false);
render_obj->Set(VAN::Position,db->CreateVBO(VF_V4F,tile_count,position_data)); primitive->Set(VAN::Position,db->CreateVBO(VF_V4F,tile_count,position_data));
render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,tile_count,tex_coord_data)); primitive->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,tile_count,tex_coord_data));
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline);
return(render_instance); return(render_instance);
} }

8
example/Vulkan/FragCoordTest.cpp
View File

@ -47,12 +47,12 @@ private:
bool InitVBO() bool InitVBO()
{ {
auto render_obj=db->CreatePrimitive(VERTEX_COUNT); auto primitive=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false); if(!primitive)return(false);
if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); renderable_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline);
return(true); return(true);
} }

6
example/Vulkan/FullScreenTriangle.cpp
View File

@ -35,10 +35,10 @@ private:
bool InitVBO() bool InitVBO()
{ {
auto render_obj=db->CreatePrimitive(3); auto primitive=db->CreatePrimitive(3);
if(!render_obj)return(false); if(!primitive)return(false);
renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); renderable_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline);
return(true); return(true);
} }

10
example/Vulkan/InstanceTriangle.cpp
View File

@ -53,13 +53,13 @@ private:
bool InitVBO() bool InitVBO()
{ {
Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT); Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false); if(!primitive)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false);
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline);
return(true); return(true);
} }

22
example/Vulkan/LoadStaticMesh.cpp
View File

@ -29,7 +29,7 @@ vulkan::Primitive *CreateMeshRenderable(Database *db,vulkan::Material *mtl,const
uint draw_count=mesh->indices_count; uint draw_count=mesh->indices_count;
vulkan::Primitive *render_obj=nullptr; vulkan::Primitive *primitive=nullptr;
{ {
const int vertex_binding=vsm->GetStageInputBinding("Vertex"); const int vertex_binding=vsm->GetStageInputBinding("Vertex");
@ -38,9 +38,9 @@ vulkan::Primitive *CreateMeshRenderable(Database *db,vulkan::Material *mtl,const
vulkan::VAB *vbo=db->CreateVAB(VAF_VEC3,mesh->vertex_count,mesh->position); vulkan::VAB *vbo=db->CreateVAB(VAF_VEC3,mesh->vertex_count,mesh->position);
render_obj=mtl->CreateRenderable(); primitive=mtl->CreateRenderable();
render_obj->Set(vertex_binding,vbo); primitive->Set(vertex_binding,vbo);
render_obj->SetBoundingBox(mesh->bounding_box); primitive->SetBoundingBox(mesh->bounding_box);
} }
const int normal_binding=vsm->GetStageInputBinding("Normal"); const int normal_binding=vsm->GetStageInputBinding("Normal");
@ -49,7 +49,7 @@ vulkan::Primitive *CreateMeshRenderable(Database *db,vulkan::Material *mtl,const
{ {
vulkan::VAB *vbo=db->CreateVAB(VAF_VEC3,mesh->vertex_count,mesh->normal); vulkan::VAB *vbo=db->CreateVAB(VAF_VEC3,mesh->vertex_count,mesh->normal);
render_obj->Set(normal_binding,vbo); primitive->Set(normal_binding,vbo);
} }
const int tagent_binding=vsm->GetStageInputBinding("Tangent"); const int tagent_binding=vsm->GetStageInputBinding("Tangent");
@ -58,7 +58,7 @@ vulkan::Primitive *CreateMeshRenderable(Database *db,vulkan::Material *mtl,const
{ {
vulkan::VAB *vbo=db->CreateVAB(VAF_VEC3,mesh->vertex_count,mesh->tangent); vulkan::VAB *vbo=db->CreateVAB(VAF_VEC3,mesh->vertex_count,mesh->tangent);
render_obj->Set(tagent_binding,vbo); primitive->Set(tagent_binding,vbo);
} }
const int bitagent_binding=vsm->GetStageInputBinding("Bitangent"); const int bitagent_binding=vsm->GetStageInputBinding("Bitangent");
@ -67,16 +67,16 @@ vulkan::Primitive *CreateMeshRenderable(Database *db,vulkan::Material *mtl,const
{ {
vulkan::VAB *vbo=db->CreateVAB(VAF_VEC3,mesh->vertex_count,mesh->bitangent); vulkan::VAB *vbo=db->CreateVAB(VAF_VEC3,mesh->vertex_count,mesh->bitangent);
render_obj->Set(bitagent_binding,vbo); primitive->Set(bitagent_binding,vbo);
} }
if(mesh->vertex_count<=0xFFFF) if(mesh->vertex_count<=0xFFFF)
render_obj->Set(db->CreateIBO16(mesh->indices_count,mesh->indices16)); primitive->Set(db->CreateIBO16(mesh->indices_count,mesh->indices16));
else else
render_obj->Set(db->CreateIBO32(mesh->indices_count,mesh->indices32)); primitive->Set(db->CreateIBO32(mesh->indices_count,mesh->indices32));
db->Add(render_obj); db->Add(primitive);
return(render_obj); return(primitive);
} }
class TestApp:public CameraAppFramework class TestApp:public CameraAppFramework

12
example/Vulkan/OffscreenRender.cpp
View File

@ -105,10 +105,10 @@ public:
cci.center_color=Vector4f(1,1,1,1); cci.center_color=Vector4f(1,1,1,1);
cci.border_color=Vector4f(1,1,1,0); cci.border_color=Vector4f(1,1,1,0);
Primitive *render_obj=CreateRenderableCircle(db,os.material_instance->GetVAB(),&cci); Primitive *primitive=CreateRenderableCircle(db,os.material_instance->GetVAB(),&cci);
if(!render_obj)return(false); if(!primitive)return(false);
os.renderable_instance=db->CreateRenderableInstance(render_obj,os.material_instance,os.pipeline); os.renderable_instance=db->CreateRenderableInstance(primitive,os.material_instance,os.pipeline);
if(!os.renderable_instance)return(false); if(!os.renderable_instance)return(false);
} }
@ -141,10 +141,10 @@ public:
cci.tex_coord=true; cci.tex_coord=true;
Primitive *render_obj=CreateRenderableCube(db,cube.material_instance->GetVAB(),&cci); Primitive *primitive=CreateRenderableCube(db,cube.material_instance->GetVAB(),&cci);
if(!render_obj)return(false); if(!primitive)return(false);
cube.renderable_instance=db->CreateRenderableInstance(render_obj,cube.material_instance,cube.pipeline); cube.renderable_instance=db->CreateRenderableInstance(primitive,cube.material_instance,cube.pipeline);
cube.scene_root.CreateSubNode(cube.renderable_instance); cube.scene_root.CreateSubNode(cube.renderable_instance);
} }

12
example/Vulkan/RectanglePrimitive.cpp
View File

@ -37,7 +37,7 @@ private:
Texture2D * texture =nullptr; Texture2D * texture =nullptr;
Sampler * sampler =nullptr; Sampler * sampler =nullptr;
MaterialInstance * material_instance =nullptr; MaterialInstance * material_instance =nullptr;
Primitive * render_obj =nullptr; Primitive * primitive =nullptr;
RenderableInstance *render_instance =nullptr; RenderableInstance *render_instance =nullptr;
Pipeline * pipeline =nullptr; Pipeline * pipeline =nullptr;
@ -66,14 +66,14 @@ private:
bool InitVBO() bool InitVBO()
{ {
render_obj=db->CreatePrimitive(VERTEX_COUNT); primitive=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false); if(!primitive)return(false);
render_obj->Set(VAN::Position,db->CreateVBO(VF_V4F,VERTEX_COUNT,position_data)); primitive->Set(VAN::Position,db->CreateVBO(VF_V4F,VERTEX_COUNT,position_data));
render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,VERTEX_COUNT,tex_coord_data)); primitive->Set(VAN::TexCoord,db->CreateVBO(VF_V4F,VERTEX_COUNT,tex_coord_data));
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline);
return(render_instance); return(render_instance);
} }

10
example/Vulkan/first_triangle.cpp
View File

@ -53,13 +53,13 @@ private:
bool InitVBO() bool InitVBO()
{ {
Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT); Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false); if(!primitive)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false);
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline);
return(true); return(true);
} }

10
example/Vulkan/indices_rect.cpp
View File

@ -56,13 +56,13 @@ private:
bool InitVBO() bool InitVBO()
{ {
auto render_obj=db->CreatePrimitive(VERTEX_COUNT); auto primitive=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false); if(!primitive)return(false);
if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false); if(!primitive->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false);
renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); renderable_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline);
return(true); return(true);
} }

10
example/Vulkan/second_triangle.cpp
View File

@ -55,13 +55,13 @@ private:
bool InitVBO() bool InitVBO()
{ {
Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT); Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false); if(!primitive)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false);
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline);
return(true); return(true);
} }

12
example/Vulkan/texture_rect.cpp
View File

@ -80,14 +80,14 @@ private:
bool InitVBO() bool InitVBO()
{ {
auto render_obj=db->CreatePrimitive(VERTEX_COUNT); auto primitive=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false); if(!primitive)return(false);
if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!render_obj->Set(VAN::TexCoord,db->CreateVBO(VF_V2F,VERTEX_COUNT,tex_coord_data)))return(false); if(!primitive->Set(VAN::TexCoord,db->CreateVBO(VF_V2F,VERTEX_COUNT,tex_coord_data)))return(false);
if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false); if(!primitive->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false);
renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); renderable_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline);
return(true); return(true);
} }

10
example/Vulkan/third_triangle.cpp
View File

@ -57,13 +57,13 @@ private:
bool InitVBO() bool InitVBO()
{ {
Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT); Primitive *primitive=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false); if(!primitive)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false); if(!primitive->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);
if(!render_obj->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false); if(!primitive->Set(VAN::Color, db->CreateVBO(VF_V4F,VERTEX_COUNT,color_data)))return(false);
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline); render_instance=db->CreateRenderableInstance(primitive,material_instance,pipeline);
render_root.CreateSubNode(render_instance); render_root.CreateSubNode(render_instance);

2
inc/hgl/graph/VKRenderResource.h
View File

@ -110,7 +110,7 @@ public: //Get
Material * GetMaterial (const MaterialID &id){return rm_material.Get(id);} Material * GetMaterial (const MaterialID &id){return rm_material.Get(id);}
MaterialInstance * GetMaterialInstance (const MaterialInstanceID &id){return rm_material_instance.Get(id);} MaterialInstance * GetMaterialInstance (const MaterialInstanceID &id){return rm_material_instance.Get(id);}
DescriptorSets * GetDescSets (const DescriptorSetsID &id){return rm_desc_sets.Get(id);} DescriptorSets * GetDescSets (const DescriptorSetsID &id){return rm_desc_sets.Get(id);}
Primitive * GetRenderable (const PrimitiveID &id){return rm_primitives.Get(id);} Primitive * GetPrimitive (const PrimitiveID &id){return rm_primitives.Get(id);}
GPUBuffer * GetBuffer (const BufferID &id){return rm_buffers.Get(id);} GPUBuffer * GetBuffer (const BufferID &id){return rm_buffers.Get(id);}
Sampler * GetSampler (const SamplerID &id){return rm_samplers.Get(id);} Sampler * GetSampler (const SamplerID &id){return rm_samplers.Get(id);}
Texture * GetTexture (const TextureID &id){return rm_textures.Get(id);} Texture * GetTexture (const TextureID &id){return rm_textures.Get(id);}

12
inc/hgl/graph/VKRenderableInstance.h
View File

@ -16,7 +16,7 @@ class RenderableInstance
{ {
Pipeline * pipeline; Pipeline * pipeline;
MaterialInstance * mat_inst; MaterialInstance * mat_inst;
Primitive * render_obj; Primitive * primitive;
uint32_t buffer_count; uint32_t buffer_count;
VkBuffer * buffer_list; VkBuffer * buffer_list;
@ -40,15 +40,15 @@ public:
VkPipelineLayout GetPipelineLayout (){return mat_inst->GetMaterial()->GetPipelineLayout();} VkPipelineLayout GetPipelineLayout (){return mat_inst->GetMaterial()->GetPipelineLayout();}
Material * GetMaterial (){return mat_inst->GetMaterial();} Material * GetMaterial (){return mat_inst->GetMaterial();}
MaterialInstance * GetMaterialInstance (){return mat_inst;} MaterialInstance * GetMaterialInstance (){return mat_inst;}
Primitive * GetRenderable (){return render_obj;} Primitive * GetPrimitive (){return primitive;}
const AABB & GetBoundingBox ()const{return render_obj->GetBoundingBox();} const AABB & GetBoundingBox ()const{return primitive->GetBoundingBox();}
const uint32_t GetBufferCount ()const{return buffer_count;} const uint32_t GetBufferCount ()const{return buffer_count;}
VkBuffer * GetBuffer ()const{return buffer_list;} VkBuffer * GetBuffer ()const{return buffer_list;}
VkDeviceSize * GetBufferSize ()const{return buffer_size;} VkDeviceSize * GetBufferSize ()const{return buffer_size;}
IndexBuffer * GetIndexBuffer ()const{return render_obj->GetIndexBuffer();} IndexBuffer * GetIndexBuffer ()const{return primitive->GetIndexBuffer();}
const uint32_t GetIndexBufferOffset()const{return render_obj->GetIndexBufferOffset();} const uint32_t GetIndexBufferOffset()const{return primitive->GetIndexBufferOffset();}
const uint32_t GetDrawCount ()const{return render_obj->GetDrawCount();} const uint32_t GetDrawCount ()const{return primitive->GetDrawCount();}
const uint32_t GetBufferHash ()const{return buffer_hash;} const uint32_t GetBufferHash ()const{return buffer_hash;}

12
src/SceneGraph/RenderableCreater.cpp
View File

@ -112,15 +112,15 @@ namespace hgl
if(ssb_map.GetCount()!=si_count) if(ssb_map.GetCount()!=si_count)
return(nullptr); return(nullptr);
Primitive *render_obj=db->CreatePrimitive(vertices_number); Primitive *primitive=db->CreatePrimitive(vertices_number);
const auto *sp=ssb_map.GetDataList(); const auto *sp=ssb_map.GetDataList();
for(uint i=0;i<si_count;i++) for(uint i=0;i<si_count;i++)
{ {
if((*sp)->right->vbo) if((*sp)->right->vbo)
render_obj->Set((*sp)->left,(*sp)->right->vbo); primitive->Set((*sp)->left,(*sp)->right->vbo);
else else
render_obj->Set((*sp)->left,db->CreateVBO((*sp)->right->data)); primitive->Set((*sp)->left,db->CreateVBO((*sp)->right->data));
++sp; ++sp;
} }
@ -128,12 +128,12 @@ namespace hgl
if(ibo) if(ibo)
{ {
ibo->Unmap(); ibo->Unmap();
render_obj->Set(ibo); primitive->Set(ibo);
} }
db->Add(render_obj); db->Add(primitive);
return render_obj; return primitive;
} }
}//namespace graph }//namespace graph
}//namespace hgl }//namespace hgl

4
src/SceneGraph/Vulkan/VKRenderableInstance.cpp
View File

@ -10,7 +10,7 @@ using namespace util;
RenderableInstance::RenderableInstance(Primitive *r,MaterialInstance *mi,Pipeline *p,const uint32_t count,VkBuffer *bl,VkDeviceSize *bs) RenderableInstance::RenderableInstance(Primitive *r,MaterialInstance *mi,Pipeline *p,const uint32_t count,VkBuffer *bl,VkDeviceSize *bs)
{ {
render_obj=r; primitive=r;
pipeline=p; pipeline=p;
mat_inst=mi; mat_inst=mi;
@ -26,7 +26,7 @@ RenderableInstance::RenderableInstance(Primitive *r,MaterialInstance *mi,Pipelin
RenderableInstance::~RenderableInstance() RenderableInstance::~RenderableInstance()
{ {
//需要在这里添加删除pipeline/desc_sets/render_obj引用计数的代码 //需要在这里添加删除pipeline/desc_sets/primitive引用计数的代码
delete[] buffer_list; delete[] buffer_list;
delete[] buffer_size; delete[] buffer_size;