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

update example 1-5

Browse Source
This commit is contained in:
hyzboy
2020-09-21 19:31:34 +08:00
parent 5cb8e5dea1
commit a0a9c9b127
4 changed files with 42 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
example/Vulkan/FragCoordTest.cpp
View File

@@ -27,20 +27,11 @@ private:
Camera cam;
vulkan::MaterialInstance * material_instance =nullptr;
vulkan::Renderable * render_obj =nullptr;
vulkan::RenderableInstance *renderable_instance =nullptr;
vulkan::Buffer * ubo_world_matrix =nullptr;
vulkan::Pipeline * pipeline =nullptr;
vulkan::VAB * vertex_buffer =nullptr;
public:
~TestApp()
{
SAFE_CLEAR(vertex_buffer);
}
private:
bool InitMaterial()
@@ -81,14 +72,12 @@ private:
bool InitVBO()
{
render_obj=db->CreateRenderable(material_instance,VERTEX_COUNT);
auto render_obj=db->CreateRenderable(VERTEX_COUNT);
if(!render_obj)return(false);
vertex_buffer=device->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data);
if(!vertex_buffer)return(false);
if(!render_obj->Set(VAN::Position,vertex_buffer))return(false);
if(!render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
return(true);
}
@@ -108,7 +97,7 @@ public:
if(!InitVBO())
return(false);
BuildCommandBuffer(pipeline,material_instance,render_obj);
BuildCommandBuffer(renderable_instance);
return(true);
}
@@ -122,7 +111,7 @@ public:
ubo_world_matrix->Write(&cam.matrix);
BuildCommandBuffer(pipeline,material_instance,render_obj);
BuildCommandBuffer(renderable_instance);
}
};//class TestApp:public VulkanApplicationFramework

29
example/Vulkan/first_triangle.cpp
View File

@@ -33,22 +33,11 @@ private:
Camera cam;
vulkan::MaterialInstance * material_instance =nullptr;
vulkan::Renderable * render_obj =nullptr;
vulkan::RenderableInstance *render_instance =nullptr;
vulkan::Buffer * ubo_world_matrix =nullptr;
vulkan::Pipeline * pipeline =nullptr;
vulkan::VAB * vertex_buffer =nullptr;
vulkan::VAB * color_buffer =nullptr;
public:
~TestApp()
{
SAFE_CLEAR(color_buffer);
SAFE_CLEAR(vertex_buffer);
}
private:
bool InitMaterial()
@@ -88,15 +77,13 @@ private:
bool InitVBO()
{
render_obj =db->CreateRenderable(material_instance,VERTEX_COUNT);
vulkan::Renderable *render_obj=db->CreateRenderable(VERTEX_COUNT);
if(!render_obj)return(false);
vertex_buffer =device->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data);
color_buffer =device->CreateVAB(VAF_VEC3,VERTEX_COUNT,color_data);
if(!render_obj->Set(VAN::Position, vertex_buffer))return(false);
if(!render_obj->Set(VAN::Color, color_buffer))return(false);
if(!render_obj->Set(VAN::Position, db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
if(!render_obj->Set(VAN::Color, db->CreateVAB(VAF_VEC3,VERTEX_COUNT,color_data)))return(false);
render_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
return(true);
}
@@ -116,7 +103,7 @@ public:
if(!InitVBO())
return(false);
BuildCommandBuffer(pipeline,material_instance,render_obj);
BuildCommandBuffer(render_instance);
return(true);
}
@@ -130,7 +117,7 @@ public:
ubo_world_matrix->Write(&cam.matrix);
BuildCommandBuffer(pipeline,material_instance,render_obj);
BuildCommandBuffer(render_instance);
}
};//class TestApp:public VulkanApplicationFramework

35
example/Vulkan/indices_rect.cpp
View File

@@ -37,22 +37,11 @@ private:
Camera cam;
vulkan::MaterialInstance * material_instance =nullptr;
vulkan::Renderable * render_obj =nullptr;
vulkan::RenderableInstance *renderable_instance =nullptr;
vulkan::Buffer * ubo_world_matrix =nullptr;
vulkan::Pipeline * pipeline =nullptr;
vulkan::VAB * vertex_buffer =nullptr;
vulkan::IndexBuffer * index_buffer =nullptr;
public:
~TestApp()
{
SAFE_CLEAR(index_buffer);
SAFE_CLEAR(vertex_buffer);
}
private:
bool InitMaterial()
@@ -87,14 +76,13 @@ private:
bool InitVBO()
{
render_obj=db->CreateRenderable(material_instance,VERTEX_COUNT);
auto render_obj=db->CreateRenderable(VERTEX_COUNT);
if(!render_obj)return(false);
vertex_buffer =device->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data);
index_buffer =device->CreateIBO16(INDEX_COUNT,index_data);
if(!render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false);
if(!render_obj->Set(VAN::Position,vertex_buffer))return(false);
if(!render_obj->Set(index_buffer))return(false);
renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
return(true);
}
@@ -115,14 +103,21 @@ public:
if(!InitVBO())
return(false);
BuildCommandBuffer(pipeline,material_instance,render_obj);
BuildCommandBuffer(renderable_instance);
return(true);
}
void Resize(int,int)override
void Resize(int w,int h)override
{
BuildCommandBuffer(pipeline,material_instance,render_obj);
cam.vp_width=w;
cam.vp_height=h;
cam.Refresh();
ubo_world_matrix->Write(&cam.matrix);
BuildCommandBuffer(renderable_instance);
}
};//class TestApp:public VulkanApplicationFramework

41
example/Vulkan/texture_rect.cpp
View File

@@ -13,8 +13,8 @@ VK_NAMESPACE_BEGIN
Texture2D *CreateTextureFromFile(Device *device,const OSString &filename);
VK_NAMESPACE_END
constexpr uint32_t SCREEN_WIDTH=128;
constexpr uint32_t SCREEN_HEIGHT=128;
constexpr uint32_t SCREEN_WIDTH=256;
constexpr uint32_t SCREEN_HEIGHT=256;
constexpr uint32_t VERTEX_COUNT=4;
@@ -51,25 +51,10 @@ private:
vulkan::Texture2D * texture =nullptr;
vulkan::Sampler * sampler =nullptr;
vulkan::MaterialInstance * material_instance =nullptr;
vulkan::Renderable * render_obj =nullptr;
vulkan::RenderableInstance *renderable_instance =nullptr;
vulkan::Buffer * ubo_world_matrix =nullptr;
vulkan::Pipeline * pipeline =nullptr;
vulkan::VAB * vertex_buffer =nullptr;
vulkan::VAB * tex_coord_buffer =nullptr;
vulkan::IndexBuffer * index_buffer =nullptr;
public:
~TestApp()
{
SAFE_CLEAR(index_buffer);
SAFE_CLEAR(tex_coord_buffer);
SAFE_CLEAR(vertex_buffer);
SAFE_CLEAR(texture);
}
private:
bool InitMaterial()
@@ -83,6 +68,8 @@ private:
texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/lena.Tex2D"));
if(!texture)return(false);
db->Add(texture);
sampler=db->CreateSampler();
material_instance->BindSampler("tex",texture,sampler);
@@ -111,16 +98,14 @@ private:
bool InitVBO()
{
render_obj=db->CreateRenderable(material_instance,VERTEX_COUNT);
auto render_obj=db->CreateRenderable(VERTEX_COUNT);
if(!render_obj)return(false);
vertex_buffer =device->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data);
tex_coord_buffer=device->CreateVAB(VAF_VEC2,VERTEX_COUNT,tex_coord_data);
index_buffer =device->CreateIBO16(INDEX_COUNT,index_data);
if(!render_obj->Set(VAN::Position,db->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data)))return(false);
if(!render_obj->Set(VAN::TexCoord,db->CreateVAB(VAF_VEC2,VERTEX_COUNT,tex_coord_data)))return(false);
if(!render_obj->Set(db->CreateIBO16(INDEX_COUNT,index_data)))return(false);
if(!render_obj->Set(VAN::Position,vertex_buffer))return(false);
if(!render_obj->Set(VAN::TexCoord,tex_coord_buffer))return(false);
if(!render_obj->Set(index_buffer))return(false);
renderable_instance=db->CreateRenderableInstance(render_obj,material_instance,pipeline);
return(true);
}
@@ -141,7 +126,7 @@ public:
if(!InitVBO())
return(false);
BuildCommandBuffer(pipeline,material_instance,render_obj);
BuildCommandBuffer(renderable_instance);
return(true);
}
@@ -154,8 +139,8 @@ public:
cam.Refresh();
ubo_world_matrix->Write(&cam.matrix);
BuildCommandBuffer(pipeline,material_instance,render_obj);
BuildCommandBuffer(renderable_instance);
}
};//class TestApp:public VulkanApplicationFramework