update example 1-5
This commit is contained in:
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user