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

renamed to Primitive from Renderable

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy)
2022-06-24 17:51:05 +08:00
parent 1e0e74da2f
commit 0fca6b8fc4
54 changed files with 148 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example/2dVector/line.cpp
View File

@@ -113,7 +113,7 @@ private:
bool InitVBO()
{
Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT);
Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);

2
example/2dVector/roundbox.cpp
View File

@@ -129,7 +129,7 @@ private:
bool InitVBO()
{
Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT);
Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V4I16,VERTEX_COUNT,position_data)))return(false);

2
example/Vulkan/Atmosphere.cpp
View File

@@ -43,7 +43,7 @@ private:
GPUBuffer * ubo_atomsphere =nullptr;
AtmosphereData atomsphere_data;
Renderable * ro_sphere =nullptr;
Primitive * ro_sphere =nullptr;
private:

8
example/Vulkan/Cubemap.cpp
View File

@@ -41,9 +41,9 @@ private:
Sampler * sampler =nullptr;
TextureCube * texture =nullptr;
Renderable * ro_axis =nullptr;
Renderable * ro_cube =nullptr;
Renderable * ro_sphere =nullptr;
Primitive * ro_axis =nullptr;
Primitive * ro_cube =nullptr;
Primitive * ro_sphere =nullptr;
private:
@@ -148,7 +148,7 @@ private:
return(true);
}
SceneNode *Add(Renderable *r,MaterialInstance *mi,Pipeline *pl)
SceneNode *Add(Primitive *r,MaterialInstance *mi,Pipeline *pl)
{
auto ri=db->CreateRenderableInstance(r,mi,pl);

2
example/Vulkan/DeferredRender.cpp
View File

@@ -80,7 +80,7 @@ private:
SubpassParam sp_gbuffer;
SubpassParam sp_composition;
Renderable *ro_plane,
Primitive *ro_plane,
*ro_cube,
*ro_sphere,
*ro_torus,

4
example/Vulkan/DrawText.cpp
View File

@@ -14,7 +14,7 @@ private:
TextRender * text_render =nullptr;
TextRenderable * text_render_obj =nullptr;
TextPrimitive * text_render_obj =nullptr;
RenderableInstance *render_instance =nullptr;
public:
@@ -40,7 +40,7 @@ private:
if(!text_render)
return(false);
text_render_obj=text_render->CreateRenderable(str);
text_render_obj=text_render->CreatePrimitive(str);
if(!text_render_obj)
return(false);

4
example/Vulkan/DrawTile.cpp
View File

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

4
example/Vulkan/EquirectangularMap.cpp
View File

@@ -32,7 +32,7 @@ private:
Sampler * sampler =nullptr;
Texture2D * texture =nullptr;
Renderable * ro_sphere =nullptr;
Primitive * ro_sphere =nullptr;
private:
@@ -74,7 +74,7 @@ private:
return(true);
}
SceneNode *Add(Renderable *r,MaterialInstance *mi,Pipeline *pl)
SceneNode *Add(Primitive *r,MaterialInstance *mi,Pipeline *pl)
{
auto ri=db->CreateRenderableInstance(r,mi,pl);

2
example/Vulkan/FragCoordTest.cpp
View File

@@ -47,7 +47,7 @@ private:
bool InitVBO()
{
auto render_obj=db->CreateRenderable(VERTEX_COUNT);
auto render_obj=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);

2
example/Vulkan/FullScreenTriangle.cpp
View File

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

4
example/Vulkan/Geometry3D.cpp
View File

@@ -28,7 +28,7 @@ private:
MaterialInstance * material_instance =nullptr;
Pipeline * pipeline =nullptr;
Renderable * ro_plane_grid[3];
Primitive * ro_plane_grid[3];
private:
@@ -47,7 +47,7 @@ private:
return(true);
}
RenderableInstance *Add(Renderable *r,const Matrix4f &mat)
RenderableInstance *Add(Primitive *r,const Matrix4f &mat)
{
RenderableInstance *ri=db->CreateRenderableInstance(r,material_instance,pipeline);

6
example/Vulkan/InlineGeometryScene.cpp
View File

@@ -59,7 +59,7 @@ private:
Texture2D * normal =nullptr;
}texture;
Renderable *ro_axis,
Primitive *ro_axis,
*ro_cube,
*ro_sphere,
*ro_torus,
@@ -230,14 +230,14 @@ private:
return(true);
}
void Add(Renderable *r,Pipeline *pl)
void Add(Primitive *r,Pipeline *pl)
{
auto ri=db->CreateRenderableInstance(r,material_instance,pl);
render_root.CreateSubNode(ri);
}
void Add(Renderable *r,Pipeline *pl,const Matrix4f &mat)
void Add(Primitive *r,Pipeline *pl,const Matrix4f &mat)
{
auto ri=db->CreateRenderableInstance(r,material_instance,pl);

2
example/Vulkan/InstanceTriangle.cpp
View File

@@ -53,7 +53,7 @@ private:
bool InitVBO()
{
Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT);
Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);

14
example/Vulkan/LoadStaticMesh.cpp
View File

@@ -23,13 +23,13 @@ using namespace hgl::graph;
constexpr uint32_t SCREEN_WIDTH=1280;
constexpr uint32_t SCREEN_HEIGHT=720;
vulkan::Renderable *CreateMeshRenderable(Database *db,vulkan::Material *mtl,const MeshData *mesh)
vulkan::Primitive *CreateMeshRenderable(Database *db,vulkan::Material *mtl,const MeshData *mesh)
{
const vulkan::VertexShaderModule *vsm=mtl->GetVertexShaderModule();
uint draw_count=mesh->indices_count;
vulkan::Renderable *render_obj=nullptr;
vulkan::Primitive *render_obj=nullptr;
{
const int vertex_binding=vsm->GetStageInputBinding("Vertex");
@@ -109,13 +109,13 @@ private:
ModelData *model_data;
vulkan::Renderable **mesh_renderable;
vulkan::Primitive **mesh_renderable;
RenderableInstance **mesh_renderable_instance;
vulkan::Renderable *axis_renderable;
vulkan::Primitive *axis_renderable;
RenderableInstance *axis_renderable_instance;
vulkan::Renderable *bbox_renderable;
vulkan::Primitive *bbox_renderable;
RenderableInstance *bbox_renderable_instance;
private:
@@ -163,7 +163,7 @@ private:
return(true);
}
RenderableInstance *CreateRenderableInstance(const MP &mp,vulkan::Renderable *r)
RenderableInstance *CreateRenderableInstance(const MP &mp,vulkan::Primitive *r)
{
return db->CreateRenderableInstance(mp.pipeline,mp.material_instance,r);
}
@@ -173,7 +173,7 @@ private:
const uint count=model_data->mesh_list.GetCount();
MeshData **md=model_data->mesh_list.GetData();
mesh_renderable =new vulkan::Renderable *[count];
mesh_renderable =new vulkan::Primitive *[count];
mesh_renderable_instance=new RenderableInstance *[count];
for(uint i=0;i<count;i++)

4
example/Vulkan/OffscreenRender.cpp
View File

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

8
example/Vulkan/RayPicking.cpp
View File

@@ -42,9 +42,9 @@ private:
MaterialInstance * material_instance =nullptr;
Pipeline * pipeline =nullptr;
Renderable * ro_plane_grid =nullptr;
Primitive * ro_plane_grid =nullptr;
Renderable * ro_line =nullptr;
Primitive * ro_line =nullptr;
VBO * vbo_pos =nullptr;
@@ -67,7 +67,7 @@ private:
return(true);
}
RenderableInstance *Add(Renderable *r,const Matrix4f &mat)
RenderableInstance *Add(Primitive *r,const Matrix4f &mat)
{
RenderableInstance *ri=db->CreateRenderableInstance(r,material_instance,pipeline);
@@ -101,7 +101,7 @@ private:
}
{
ro_line=db->CreateRenderable(2);
ro_line=db->CreatePrimitive(2);
if(!ro_line)return(false);
if(!ro_line->Set(VAN::Position, vbo_pos=db->CreateVBO(VF_V3F,2,position_data)))return(false);

4
example/Vulkan/RectanglePrimitive.cpp
View File

@@ -37,7 +37,7 @@ private:
Texture2D * texture =nullptr;
Sampler * sampler =nullptr;
MaterialInstance * material_instance =nullptr;
Renderable * render_obj =nullptr;
Primitive * render_obj =nullptr;
RenderableInstance *render_instance =nullptr;
Pipeline * pipeline =nullptr;
@@ -66,7 +66,7 @@ private:
bool InitVBO()
{
render_obj=db->CreateRenderable(VERTEX_COUNT);
render_obj=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false);

2
example/Vulkan/SceneTree.cpp
View File

@@ -36,7 +36,7 @@ private:
GPUBuffer * ubo_color =nullptr;
GPUBuffer * ubo_sun =nullptr;
Renderable * renderable_object =nullptr;
Primitive * renderable_object =nullptr;
Pipeline * pipeline =nullptr;

4
example/Vulkan/SkyColor.cpp
View File

@@ -34,7 +34,7 @@ private:
GPUBuffer * ubo_sky_color =nullptr;
Renderable * ro_skyphere =nullptr;
Primitive * ro_skyphere =nullptr;
private:
@@ -77,7 +77,7 @@ private:
return(true);
}
RenderableInstance *Add(Renderable *r,const Matrix4f &mat)
RenderableInstance *Add(Primitive *r,const Matrix4f &mat)
{
RenderableInstance *ri=db->CreateRenderableInstance(r,material_instance,pipeline);

6
example/Vulkan/TerrainSimple.cpp
View File

@@ -28,7 +28,7 @@ constexpr uint32_t SCREEN_HEIGHT=720;
/**
* <20><><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
*/
Renderable *CreateRenderableTerrain(RenderResource *db,const VAB *vab,const TerrainCreateInfo *tci)
Primitive *CreateRenderableTerrain(RenderResource *db,const VAB *vab,const TerrainCreateInfo *tci)
{
}
@@ -47,7 +47,7 @@ private:
MaterialInstance * material_instance =nullptr;
Pipeline * pipeline =nullptr;
Renderable * renderable =nullptr;
Primitive * renderable =nullptr;
private:
@@ -66,7 +66,7 @@ private:
return(true);
}
RenderableInstance *Add(Renderable *r,const Matrix4f &mat)
RenderableInstance *Add(Primitive *r,const Matrix4f &mat)
{
RenderableInstance *ri=db->CreateRenderableInstance(r,material_instance,pipeline);

2
example/Vulkan/first_triangle.cpp
View File

@@ -53,7 +53,7 @@ private:
bool InitVBO()
{
Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT);
Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);

2
example/Vulkan/indices_rect.cpp
View File

@@ -56,7 +56,7 @@ private:
bool InitVBO()
{
auto render_obj=db->CreateRenderable(VERTEX_COUNT);
auto render_obj=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);

2
example/Vulkan/second_triangle.cpp
View File

@@ -55,7 +55,7 @@ private:
bool InitVBO()
{
Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT);
Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);

2
example/Vulkan/texture_rect.cpp
View File

@@ -80,7 +80,7 @@ private:
bool InitVBO()
{
auto render_obj=db->CreateRenderable(VERTEX_COUNT);
auto render_obj=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position,db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);

2
example/Vulkan/third_triangle.cpp
View File

@@ -57,7 +57,7 @@ private:
bool InitVBO()
{
Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT);
Primitive *render_obj=db->CreatePrimitive(VERTEX_COUNT);
if(!render_obj)return(false);
if(!render_obj->Set(VAN::Position, db->CreateVBO(VF_V2F,VERTEX_COUNT,position_data)))return(false);

2
example/common/VulkanAppFramework.h
View File

@@ -7,7 +7,7 @@
#include<hgl/graph/VKBuffer.h>
#include<hgl/graph/VKShaderModule.h>
#include<hgl/graph/VKImageView.h>
#include<hgl/graph/VKRenderable.h>
#include<hgl/graph/VKPrimitive.h>
#include<hgl/graph/VKDescriptorSets.h>
#include<hgl/graph/VKRenderPass.h>
#include<hgl/graph/VKPipeline.h>