From 776a887911e9a8cf77cf5e0b9d52c5fe9300353f Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 3 Dec 2019 22:18:31 +0800 Subject: [PATCH] delete texture_linear.cpp --- example/Vulkan/CMakeLists.txt | 3 +- example/Vulkan/texture_linear.cpp | 205 ------------------------------ 2 files changed, 1 insertion(+), 207 deletions(-) delete mode 100644 example/Vulkan/texture_linear.cpp diff --git a/example/Vulkan/CMakeLists.txt b/example/Vulkan/CMakeLists.txt index ce4056c8..d885f94b 100644 --- a/example/Vulkan/CMakeLists.txt +++ b/example/Vulkan/CMakeLists.txt @@ -11,8 +11,7 @@ endmacro() CreateProject(00.triangle first_triangle.cpp) CreateProject(01.indices_rect indices_rect.cpp) -CreateProject(02.1.texture_rect texture_rect.cpp) -#CreateProject(02.2.texture_linear texture_linear.cpp) +CreateProject(02.texture_rect texture_rect.cpp) CreateProject(03.HQFilterTexture HQFilterTexture.cpp) CreateProject(04.Geometry2D Geometry2D.cpp) CreateProject(05.Geometry3D Geometry3D.cpp) diff --git a/example/Vulkan/texture_linear.cpp b/example/Vulkan/texture_linear.cpp deleted file mode 100644 index 80ba41b4..00000000 --- a/example/Vulkan/texture_linear.cpp +++ /dev/null @@ -1,205 +0,0 @@ -// 2.texture_rect -// 该示例是1.indices_rect的进化，演示在矩形上贴上贴图 - -#include"VulkanAppFramework.h" -#include -#include -#include - -using namespace hgl; -using namespace hgl::graph; - -VK_NAMESPACE_BEGIN -Texture2D *LoadTGATexture(const OSString &filename,Device *device,bool=true); -VK_NAMESPACE_END - -constexpr uint32_t SCREEN_WIDTH=128; -constexpr uint32_t SCREEN_HEIGHT=128; - -struct WorldConfig -{ - Matrix4f mvp; -}world; - -constexpr uint32_t VERTEX_COUNT=4; - -constexpr float vertex_data[VERTEX_COUNT][2]= -{ - {0, 0}, - {SCREEN_WIDTH, 0}, - {0, SCREEN_HEIGHT}, - {SCREEN_WIDTH, SCREEN_HEIGHT} -}; - -constexpr float tex_coord_data[VERTEX_COUNT][2]= -{ - {0,0}, - {1,0}, - {0,1}, - {1,1} -}; - -constexpr uint32_t INDEX_COUNT=6; - -constexpr uint16 index_data[INDEX_COUNT]= -{ - 0,1,3, - 0,3,2 -}; - -class TestApp:public VulkanApplicationFramework -{ -private: - - vulkan::Material * material =nullptr; - vulkan::Texture2D * texture =nullptr; - vulkan::Sampler * sampler =nullptr; - vulkan::DescriptorSets * descriptor_sets =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; - vulkan::IndexBuffer * index_buffer =nullptr; - -public: - - ~TestApp() - { - SAFE_CLEAR(index_buffer); - SAFE_CLEAR(tex_coord_buffer); - SAFE_CLEAR(vertex_buffer); - SAFE_CLEAR(pipeline); - SAFE_CLEAR(ubo_mvp); - SAFE_CLEAR(render_obj); - SAFE_CLEAR(descriptor_sets); - SAFE_CLEAR(sampler); - SAFE_CLEAR(texture); - SAFE_CLEAR(material); - } - -private: - - bool InitMaterial() - { - material=shader_manage->CreateMaterial(OS_TEXT("res/shader/FlatTexture.vert.spv"), - OS_TEXT("res/shader/FlatTexture.frag.spv")); - if(!material) - return(false); - - render_obj=material->CreateRenderable(VERTEX_COUNT); - descriptor_sets=material->CreateDescriptorSets(); - - texture=vulkan::LoadTGATexture(OS_TEXT("res/image/lena.tga"),device); - - 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); - - descriptor_sets->BindSampler(material->GetSampler("tex"),texture,sampler); - descriptor_sets->BindUBO(material->GetUBO("world"),ubo_mvp); - descriptor_sets->Update(); - - return(true); - } - - bool InitUBO() - { - const VkExtent2D extent=sc_render_target->GetExtent(); - - world.mvp=ortho(extent.width,extent.height); - - ubo_mvp=device->CreateUBO(sizeof(WorldConfig),&world); - - return ubo_mvp; - } - - void InitVBO() - { - vertex_buffer =device->CreateVBO(FMT_RG32F,VERTEX_COUNT,vertex_data); - tex_coord_buffer=device->CreateVBO(FMT_RG32F,VERTEX_COUNT,tex_coord_data); - index_buffer =device->CreateIBO16(INDEX_COUNT,index_data); - - render_obj->Set("Vertex",vertex_buffer); - render_obj->Set("TexCoord",tex_coord_buffer); - render_obj->Set(index_buffer); - } - - bool InitPipeline() - { - AutoDelete - pipeline_creater=new vulkan::PipelineCreater(device,material,sc_render_target); - pipeline_creater->CloseCullFace(); - pipeline_creater->Set(PRIM_TRIANGLES); - - 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,descriptor_sets,render_obj); - - return(true); - } - - void Resize(int,int)override - { - BuildCommandBuffer(pipeline,descriptor_sets,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; -}