diff --git a/CMCore b/CMCore index b0ac4463..77a570d6 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit b0ac44632202b2f2ef6921b669c7ed4c48d3ee4a +Subproject commit 77a570d6beb4d7bc68333b7063cadcf69b891589 diff --git a/example/Vulkan/CMakeLists.txt b/example/Vulkan/CMakeLists.txt index d9800499..f5bd54cd 100644 --- a/example/Vulkan/CMakeLists.txt +++ b/example/Vulkan/CMakeLists.txt @@ -36,7 +36,7 @@ CreateProject(09.LoadStaticMesh LoadStaticMesh.cpp LoadScene.cpp) CreateProject(10.InlineGeometryScene InlineGeometryScene.cpp) CreateProject(11.Atomsphere Atomsphere.cpp) -CreateProject(12.RectanglePrimivate RectanglePrimivate.cpp) +CreateProject(12.RectanglePrimitive RectanglePrimitive.cpp) CreateProject(13.DrawText DrawText.cpp) IF(SUPPORT_QT_VULKAN) diff --git a/example/Vulkan/RectanglePrimitive.cpp b/example/Vulkan/RectanglePrimitive.cpp new file mode 100644 index 00000000..0e56a6f3 --- /dev/null +++ b/example/Vulkan/RectanglePrimitive.cpp @@ -0,0 +1,178 @@ +// 2.RectanglePrimivate +// 该示例是texture_rect的进化，演示使用GeometryShader画矩形 + +#include"VulkanAppFramework.h" +#include +#include +#include + +using namespace hgl; +using namespace hgl::graph; + +VK_NAMESPACE_BEGIN +Texture2D *CreateTextureFromFile(Device *device,const OSString &filename); +VK_NAMESPACE_END + +constexpr uint32_t SCREEN_WIDTH=512; +constexpr uint32_t SCREEN_HEIGHT=512; + +constexpr uint32_t VERTEX_COUNT=1; + +constexpr float vertex_data[4]= +{ + 128, 128, + 384, 384 +}; + +constexpr float tex_coord_data[4]= +{ + 0,0,1,1 +}; + +class TestApp:public VulkanApplicationFramework +{ + Camera cam; + +private: + + vulkan::Material * material =nullptr; + vulkan::Texture2D * texture =nullptr; + vulkan::Sampler * sampler =nullptr; + vulkan::MaterialInstance * material_instance =nullptr; + vulkan::Renderable * render_obj =nullptr; + vulkan::Buffer * ubo_mvp =nullptr; + + vulkan::Pipeline * pipeline =nullptr; + + vulkan::VertexBuffer * vertex_buffer =nullptr; + vulkan::VertexBuffer * tex_coord_buffer =nullptr; + +public: + + ~TestApp() + { + SAFE_CLEAR(tex_coord_buffer); + SAFE_CLEAR(vertex_buffer); + SAFE_CLEAR(pipeline); + SAFE_CLEAR(ubo_mvp); + SAFE_CLEAR(render_obj); + SAFE_CLEAR(material_instance); + SAFE_CLEAR(sampler); + SAFE_CLEAR(texture); + SAFE_CLEAR(material); + } + +private: + + bool InitMaterial() + { + material=shader_manage->CreateMaterial( OS_TEXT("res/shader/DrawRect2D.vert"), + OS_TEXT("res/shader/DrawRect2D.geom"), + OS_TEXT("res/shader/FlatTexture.frag")); + if(!material) + return(false); + + render_obj=material->CreateRenderable(VERTEX_COUNT); + material_instance=material->CreateInstance(); + + texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/lena.Tex2D")); + + sampler=device->CreateSampler(); + + material_instance->BindSampler("tex",texture,sampler); + material_instance->BindUBO("world",ubo_mvp); + material_instance->Update(); + + return(true); + } + + bool InitUBO() + { + const VkExtent2D extent=sc_render_target->GetExtent(); + + cam.width=extent.width; + cam.height=extent.height; + + cam.Refresh(); + + ubo_mvp=device->CreateUBO(sizeof(WorldMatrix),&cam.matrix); + + if(!ubo_mvp) + return(false); + + return(true); + } + + void InitVBO() + { + vertex_buffer =device->CreateVBO(FMT_RGBA32F,VERTEX_COUNT,vertex_data); + tex_coord_buffer=device->CreateVBO(FMT_RGBA32F,VERTEX_COUNT,tex_coord_data); + + render_obj->Set("Vertex",vertex_buffer); + render_obj->Set("TexCoord",tex_coord_buffer); + } + + bool InitPipeline() + { + AutoDelete + pipeline_creater=new vulkan::PipelineCreater(device,material,sc_render_target); + pipeline_creater->CloseCullFace(); + pipeline_creater->Set(PRIM_RECTANGLES); + + pipeline=pipeline_creater->Create(); + + return pipeline; + } + +public: + + bool Init() + { + if(!VulkanApplicationFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT)) + return(false); + + if(!InitUBO()) + return(false); + + if(!InitMaterial()) + return(false); + + InitVBO(); + + if(!InitPipeline()) + return(false); + + BuildCommandBuffer(pipeline,material_instance,render_obj); + + return(true); + } + + void Resize(int w,int h)override + { + cam.width=w; + cam.height=h; + + cam.Refresh(); + + ubo_mvp->Write(&cam.matrix); + + BuildCommandBuffer(pipeline,material_instance,render_obj); + } +};//class TestApp:public VulkanApplicationFramework + +int main(int,char **) +{ +#ifdef _DEBUG + if(!vulkan::CheckStrideBytesByFormat()) + return 0xff; +#endif// + + TestApp app; + + if(!app.Init()) + return(-1); + + while(app.Run()); + + return 0; +} diff --git a/example/Vulkan/texture_rect.cpp b/example/Vulkan/texture_rect.cpp index 6905395f..180d1bdb 100644 --- a/example/Vulkan/texture_rect.cpp +++ b/example/Vulkan/texture_rect.cpp @@ -91,28 +91,7 @@ private: texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/lena.Tex2D")); - VkSamplerCreateInfo sampler_create_info; - - sampler_create_info.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO; - sampler_create_info.pNext = nullptr; - sampler_create_info.flags = 0; - sampler_create_info.magFilter = VK_FILTER_LINEAR; - sampler_create_info.minFilter = VK_FILTER_LINEAR; - sampler_create_info.mipmapMode = VK_SAMPLER_MIPMAP_MODE_LINEAR; - sampler_create_info.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; - sampler_create_info.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; - sampler_create_info.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; - sampler_create_info.mipLodBias = 0.0f; - sampler_create_info.anisotropyEnable = false; - sampler_create_info.maxAnisotropy = 0; - sampler_create_info.compareEnable = false; - sampler_create_info.compareOp = VK_COMPARE_OP_NEVER; - sampler_create_info.minLod = 0.0f; - sampler_create_info.maxLod = 1.0f; - sampler_create_info.borderColor = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK; - sampler_create_info.unnormalizedCoordinates = false; - - sampler=device->CreateSampler(&sampler_create_info); + sampler=device->CreateSampler(); material_instance->BindSampler("tex",texture,sampler); material_instance->BindUBO("world",ubo_mvp); diff --git a/res b/res index 1c75bad0..9ce56221 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit 1c75bad0e6b2cada8fbaed04713d1fa619f96976 +Subproject commit 9ce56221ff5907b041147f12fda367c226eba73f