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

upgrade RectanglePrimitive example, support new material/pipeline system

Browse Source
This commit is contained in:
hyzboy 2020-09-27 22:30:12 +08:00
parent d65cab330e
commit d911a59fd9
3 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/Vulkan/Atomsphere.cpp
View File

@ -79,8 +79,8 @@ private:
bool InitScene() bool InitScene()
{ {
ro_sphere=CreateRenderableSphere(db,material_instance->GetMaterial(),128); ro_sphere=CreateRenderableSphere(db,material_instance->GetMaterial(),128);
render_root.Add(db->CreateRenderableInstance(pipeline_solid,material_instance,ro_sphere),scale(100)); render_root.Add(db->CreateRenderableInstance(ro_sphere,material_instance,pipeline_solid),scale(100));
render_root.RefreshMatrix(); render_root.RefreshMatrix();
render_root.ExpendToList(&render_list); render_root.ExpendToList(&render_list);

51
example/Vulkan/RectanglePrimitive.cpp
View File

@ -36,30 +36,24 @@ class TestApp:public VulkanApplicationFramework
private: private:
vulkan::Material * material =nullptr;
vulkan::Texture2D * texture =nullptr; vulkan::Texture2D * texture =nullptr;
vulkan::Sampler * sampler =nullptr; vulkan::Sampler * sampler =nullptr;
vulkan::MaterialInstance * material_instance =nullptr; vulkan::MaterialInstance * material_instance =nullptr;
vulkan::Renderable * render_obj =nullptr; vulkan::Renderable * render_obj =nullptr;
vulkan::RenderableInstance *render_instance =nullptr;
vulkan::Buffer * ubo_world_matrix =nullptr; vulkan::Buffer * ubo_world_matrix =nullptr;
vulkan::Pipeline * pipeline =nullptr; vulkan::Pipeline * pipeline =nullptr;
vulkan::VAB *vertex_buffer =nullptr;
vulkan::VAB *tex_coord_buffer =nullptr;
private: private:
bool InitMaterial() bool InitMaterial()
{ {
material=shader_manage->CreateMaterial( OS_TEXT("res/shader/DrawRect2D.vert"), material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/TextureRect2D"));
OS_TEXT("res/shader/DrawRect2D.geom"), if(!material_instance)
OS_TEXT("res/shader/FlatTexture.frag"));
if(!material)
return(false); return(false);
render_obj=db->CreateRenderable(material,VERTEX_COUNT); pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/default"),Prim::Rectangles);
material_instance=db->CreateMaterialInstance(material);
texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/lena.Tex2D")); texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/lena.Tex2D"));
@ -69,7 +63,6 @@ private:
material_instance->BindUBO("world",ubo_world_matrix); material_instance->BindUBO("world",ubo_world_matrix);
material_instance->Update(); material_instance->Update();
db->Add(material);
db->Add(texture); db->Add(texture);
return(true); return(true);
} }
@ -91,26 +84,18 @@ private:
return(true); return(true);
} }
void InitVBO() bool InitVBO()
{ {
vertex_buffer =db->CreateVAB(VAF_VEC4,VERTEX_COUNT,vertex_data); render_obj=db->CreateRenderable(VERTEX_COUNT);
tex_coord_buffer=db->CreateVAB(VAF_VEC4,VERTEX_COUNT,tex_coord_data);
render_obj->Set(VAN::Position,vertex_buffer); if(!render_obj)return(false);
render_obj->Set(VAN::TexCoord,tex_coord_buffer);
}
bool InitPipeline() render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC4,VERTEX_COUNT,vertex_data));
{ render_obj->Set(VAN::TexCoord,db->CreateVAB(VAF_VEC4,VERTEX_COUNT,tex_coord_data));
AutoDelete<vulkan::PipelineCreater>
pipeline_creater=new vulkan::PipelineCreater(device,material,sc_render_target); render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
pipeline_creater->CloseCullFace();
pipeline_creater->Set(Prim::Rectangles);
pipeline=pipeline_creater->Create(); return(render_instance);
db->Add(pipeline);
return pipeline;
} }
public: public:
@ -126,12 +111,10 @@ public:
if(!InitMaterial()) if(!InitMaterial())
return(false); return(false);
InitVBO(); if(!InitVBO())
if(!InitPipeline())
return(false); return(false);
BuildCommandBuffer(pipeline,material_instance,render_obj); BuildCommandBuffer(render_instance);
return(true); return(true);
} }
@ -144,8 +127,8 @@ public:
cam.Refresh(); cam.Refresh();
ubo_world_matrix->Write(&cam.matrix); ubo_world_matrix->Write(&cam.matrix);
BuildCommandBuffer(pipeline,material_instance,render_obj); BuildCommandBuffer(render_instance);
} }
};//class TestApp:public VulkanApplicationFramework };//class TestApp:public VulkanApplicationFramework

2
res

@ -1 +1 @@
Subproject commit 720c695a76e17d9babc78bafc17790c28f6d8ae1 Subproject commit 79811a8165c34d49b4c2ac613b282b310b5d977e