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

finished dynamic UBO for RenderList,,,but rendering breakout error.

Browse Source
This commit is contained in:
hyzboy
2021-06-22 21:33:47 +08:00
parent bbab22304d
commit c3e9015d95
16 changed files with 152 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example/Vulkan/DeferredModel.cpp
View File

@@ -70,7 +70,7 @@ private:
struct SubpassParam
{
Material * material;
MaterialParameters * material_instance;
MaterialInstance * material_instance;
Pipeline * pipeline_fan;
Pipeline * pipeline_triangles;
};//

4
example/Vulkan/Geometry2D.cpp
View File

@@ -29,7 +29,7 @@ private:
RenderList render_list;
Material * material =nullptr;
MaterialParameters * material_instance =nullptr;
MaterialInstance * material_instance =nullptr;
Renderable * ro_rectangle =nullptr;
Renderable * ro_circle =nullptr;
@@ -119,7 +119,7 @@ private:
cam.Refresh();
ubo_camera_info =CreateUBO("camera", sizeof(CameraInfo),&cam.info);
ubo_color_material =CreateUBO("color_material",sizeof(Vector4f),&color);
ubo_color_material =CreateUBO("color_material", sizeof(Vector4f),&color);
material_instance->Update();
return(true);

68
example/Vulkan/Geometry3D.cpp
View File

@@ -22,14 +22,14 @@ class TestApp:public CameraAppFramework
private:
SceneNode render_root;
RenderList render_list;
RenderList *render_list=nullptr;
struct MDP
{
Material * material =nullptr;
MaterialParameters * material_instance =nullptr;
MaterialInstance * material_instance =nullptr;
Pipeline * pipeline =nullptr;
}m3d,m2d;
}m3d;//,m2d;
Renderable *ro_plane_grid[3],
*ro_round_rectangle =nullptr;
@@ -46,10 +46,17 @@ private:
mdp->pipeline=CreatePipeline(mdp->material_instance,InlinePipeline::Solid3D,primitive);
if(!mdp->material_instance->BindUBO("camera",GetCameraInfoBuffer()))
return(false);
{
MaterialParameters *mp_global=mdp->material_instance->GetMP(DescriptorSetType::Global);
if(!mp_global)
return(false);
if(!mp_global->BindUBO("g_camera",GetCameraInfoBuffer()))return(false);
mp_global->Update();
}
mdp->material_instance->Update();
return(true);
}
@@ -57,14 +64,14 @@ private:
{
auto ri=db->CreateRenderableInstance(r,mdp.material_instance,mdp.pipeline);
render_root.Add(ri);
render_root.CreateSubNode(ri);
}
void Add(Renderable *r,MDP &mdp,const Matrix4f &mat)
{
auto ri=db->CreateRenderableInstance(r,mdp.material_instance,mdp.pipeline);
render_root.Add(ri,mat);
render_root.CreateSubNode(mat,ri);
}
void CreateRenderObject()
@@ -96,54 +103,61 @@ private:
pgci.side_color.Set(0,0,1,1);
ro_plane_grid[2]=CreateRenderablePlaneGrid(db,m3d.material,&pgci);
{
struct RoundRectangleCreateInfo rrci;
//{
// struct RoundRectangleCreateInfo rrci;
rrci.scope.Set(SCREEN_WIDTH-30,10,20,20);
rrci.radius=5;
rrci.round_per=5;
// rrci.scope.Set(SCREEN_WIDTH-30,10,20,20);
// rrci.radius=5;
// rrci.round_per=5;
ro_round_rectangle=CreateRenderableRoundRectangle(db,m2d.material,&rrci);
}
// ro_round_rectangle=CreateRenderableRoundRectangle(db,m2d.material,&rrci);
//}
camera->pos.Set(200,200,200,1.0);
}
bool InitScene()
{
Add(ro_round_rectangle,m2d);
// Add(ro_round_rectangle,m2d);
Add(ro_plane_grid[0],m3d);
Add(ro_plane_grid[1],m3d,rotate(HGL_RAD_90,0,1,0));
Add(ro_plane_grid[2],m3d,rotate(HGL_RAD_90,1,0,0));
render_root.RefreshMatrix();
render_root.ExpendToList(&render_list);
render_list->Expend(camera->info,&render_root);
return(true);
}
public:
~TestApp()
{
SAFE_CLEAR(render_list);
}
bool Init()
{
if(!CameraAppFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT))
return(false);
render_list=new RenderList(device);
if(!InitMDP(&m3d,Prim::Lines,OS_TEXT("res/material/VertexColor3D")))
return(false);
if(!InitMDP(&m2d,Prim::Fan, OS_TEXT("res/material/PureColor2D")))
return(false);
//if(!InitMDP(&m2d,Prim::Fan, OS_TEXT("res/material/PureColor2D")))
// return(false);
{
color.Set(1,1,0,1);
ubo_color=device->CreateUBO(sizeof(Vector4f),&color);
//{
// color.Set(1,1,0,1);
// ubo_color=device->CreateUBO(sizeof(Vector4f),&color);
m2d.material_instance->BindUBO("color_material",ubo_color);
m2d.material_instance->Update();
// m2d.material_instance->BindUBO("color_material",ubo_color);
// m2d.material_instance->Update();
db->Add(ubo_color);
}
// db->Add(ubo_color);
//}
CreateRenderObject();
@@ -155,7 +169,7 @@ public:
void BuildCommandBuffer(uint32 index)
{
VulkanApplicationFramework::BuildCommandBuffer(index,&render_list);
VulkanApplicationFramework::BuildCommandBuffer(index,render_list);
}
};//class TestApp:public CameraAppFramework

23
example/Vulkan/HQFilterTexture.cpp
View File

@@ -54,7 +54,7 @@ private:
struct MIR
{
MaterialParameters * material_instance =nullptr;
MaterialInstance * material_instance =nullptr;
RenderableInstance *renderable_instance =nullptr;
}mir_nearest,mir_linear,mir_nearest_hq,mir_linear_hq;
@@ -64,8 +64,9 @@ private:
VAB * tex_coord_buffer =nullptr;
IndexBuffer * index_buffer =nullptr;
SceneNode render_root;
RenderList render_list;
SceneNode render_root;
RenderList render_list;
public:
~TestApp()
@@ -160,9 +161,17 @@ private:
{
mir->material_instance=db->CreateMaterialInstance(mp->material);
if(!mir->material_instance)return(false);
{
MaterialParameters *mp_texture=mir->material_instance->GetMP(DescriptorSetType::Value);
if(!mp_texture)
return(false);
if(!mir->material_instance->BindSampler("tex",texture,sampler))return(false);
mir->material_instance->Update();
if(!mp_texture->BindSampler("tex",texture,sampler))return(false);
mp_texture->Update();
}
mir->renderable_instance=db->CreateRenderableInstance(render_obj,mir->material_instance,mp->pipeline);
@@ -174,7 +183,7 @@ private:
bool Add(struct MIR *mir,const Matrix4f &offset)
{
render_root.Add(mir->renderable_instance,offset);
render_root.CreateSubNode(offset,mir->renderable_instance);
return(true);
}
@@ -187,7 +196,7 @@ private:
Add(&mir_linear_hq, translate( 0, 0,0));
render_root.RefreshMatrix();
render_root.ExpendToList(&render_list);
render_list.Expend(&render_root);
BuildCommandBuffer(&render_list);
return(true);
}