upgrade FragCoordTest.cpp

This commit is contained in:
hyzboy 2020-09-21 12:37:44 +08:00
parent 325992dad3
commit ecf44bc474

View File

@ -7,9 +7,6 @@
using namespace hgl; using namespace hgl;
using namespace hgl::graph; using namespace hgl::graph;
bool SaveToFile(const OSString &filename,VK_NAMESPACE::PipelineCreater *pc);
bool LoadFromFile(const OSString &filename,VK_NAMESPACE::PipelineCreater *pc);
constexpr uint32_t SCREEN_WIDTH=128; constexpr uint32_t SCREEN_WIDTH=128;
constexpr uint32_t SCREEN_HEIGHT=128; constexpr uint32_t SCREEN_HEIGHT=128;
@ -29,7 +26,6 @@ private:
Camera cam; Camera cam;
vulkan::Material * material =nullptr;
vulkan::MaterialInstance * material_instance =nullptr; vulkan::MaterialInstance * material_instance =nullptr;
vulkan::Renderable * render_obj =nullptr; vulkan::Renderable * render_obj =nullptr;
vulkan::Buffer * ubo_world_matrix =nullptr; vulkan::Buffer * ubo_world_matrix =nullptr;
@ -43,24 +39,22 @@ public:
~TestApp() ~TestApp()
{ {
SAFE_CLEAR(vertex_buffer); SAFE_CLEAR(vertex_buffer);
SAFE_CLEAR(pipeline);
SAFE_CLEAR(ubo_world_matrix);
SAFE_CLEAR(render_obj);
SAFE_CLEAR(material_instance);
SAFE_CLEAR(material);
} }
private: private:
bool InitMaterial() bool InitMaterial()
{ {
material=shader_manage->CreateMaterial(OS_TEXT("res/shader/OnlyPosition.vert"), material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/FragColor"));
OS_TEXT("res/shader/FragCoord.frag"));
if(!material) if(!material_instance)
return(false);
pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/solid2d"),Prim::TriangleStrip);
if(!pipeline)
return(false); return(false);
render_obj=material->CreateRenderable(VERTEX_COUNT);
material_instance=material->CreateInstance();
return(true); return(true);
} }
@ -73,35 +67,29 @@ private:
cam.Refresh(); cam.Refresh();
ubo_world_matrix=device->CreateUBO(sizeof(WorldMatrix),&cam.matrix); ubo_world_matrix=db->CreateUBO(sizeof(WorldMatrix),&cam.matrix);
if(!ubo_world_matrix) if(!ubo_world_matrix)
return(false); return(false);
material_instance->BindUBO("world",ubo_world_matrix); if(!material_instance->BindUBO("world",ubo_world_matrix))return(false);
material_instance->BindUBO("fragment_world",ubo_world_matrix); if(!material_instance->BindUBO("frag_world",ubo_world_matrix))return(false);
material_instance->Update(); material_instance->Update();
return(true); return(true);
} }
void InitVBO() bool InitVBO()
{ {
vertex_buffer =device->CreateVAB(FMT_RG32F, VERTEX_COUNT,vertex_data); render_obj=db->CreateRenderable(material_instance,VERTEX_COUNT);
if(!render_obj)return(false);
render_obj->Set("Vertex", vertex_buffer); vertex_buffer=device->CreateVAB(VAF_VEC2,VERTEX_COUNT,vertex_data);
} if(!vertex_buffer)return(false);
bool InitPipeline() if(!render_obj->Set(VAN::Position,vertex_buffer))return(false);
{
AutoDelete<vulkan::PipelineCreater>
pipeline_creater=new vulkan::PipelineCreater(device,material,sc_render_target);
pipeline_creater->CloseCullFace();
pipeline_creater->Set(PRIM_TRIANGLE_STRIP);
pipeline=pipeline_creater->Create(); return(true);
return pipeline;
} }
public: public:
@ -117,9 +105,7 @@ public:
if(!InitUBO()) if(!InitUBO())
return(false); return(false);
InitVBO(); if(!InitVBO())
if(!InitPipeline())
return(false); return(false);
BuildCommandBuffer(pipeline,material_instance,render_obj); BuildCommandBuffer(pipeline,material_instance,render_obj);