增加新的Mesh/Material文件，以及SceneFile加载代码（未完成不可用）

example/Vulkan/CMakeLists.txt

@@ -11,3 +11,4 @@ CreateProject(2.texture_rect texture_rect)
 target_link_libraries(2.texture_rect TGATexture)
 CreateProject(3.Geometry2D Geometry2D)
 CreateProject(4.Geometry3D Geometry3D)
+CreateProject(5.LoadModel LoadModel)

example/Vulkan/Geometry3D.cpp

@@ -10,8 +10,8 @@
 using namespace hgl;
 using namespace hgl::graph;
 
-constexpr uint32_t SCREEN_WIDTH=1280;
-constexpr uint32_t SCREEN_HEIGHT=720;
+constexpr uint32_t SCREEN_WIDTH=256;
+constexpr uint32_t SCREEN_HEIGHT=256;
 
 class TestApp:public VulkanApplicationFramework
 {

example/Vulkan/LoadModel.cpp

@@ -0,0 +1,237 @@
+// 5.LoadModel
+//  加载纯色无贴图模型
+
+#include"VulkanAppFramework.h"
+#include<hgl/filesystem/FileSystem.h>
+#include<hgl/graph/InlineGeometry.h>
+#include<hgl/graph/SceneDB.h>
+#include<hgl/graph/RenderableInstance.h>
+#include<hgl/graph/RenderList.h>
+
+using namespace hgl;
+using namespace hgl::graph;
+
+constexpr uint32_t SCREEN_WIDTH=256;
+constexpr uint32_t SCREEN_HEIGHT=256;
+
+class TestApp:public VulkanApplicationFramework
+{
+private:
+
+    uint swap_chain_count=0;
+
+    SceneDB *   db                  =nullptr;
+    SceneNode   render_root;
+    RenderList  render_list;
+
+    Camera      camera;
+
+    vulkan::Material *          material            =nullptr;
+    vulkan::DescriptorSets *    descriptor_sets     =nullptr;
+
+    vulkan::Buffer *            ubo_world_matrix    =nullptr;
+
+    vulkan::Pipeline *          pipeline_line       =nullptr;
+    vulkan::CommandBuffer **    cmd_buf             =nullptr;
+
+public:
+
+    ~TestApp()
+    {
+        SAFE_CLEAR(db);
+
+        SAFE_CLEAR_OBJECT_ARRAY(cmd_buf,swap_chain_count);
+    }
+
+private:
+
+    void InitCamera()
+    {
+        camera.type=CameraType::Perspective;
+        camera.center.Set(0,0,0);
+        camera.eye.Set(100,100,100);
+        camera.up_vector.Set(0,0,1);
+        camera.forward_vector.Set(0,1,0);
+        camera.znear=4;
+        camera.zfar=1000;
+        camera.fov=90;
+        camera.width=SCREEN_WIDTH;
+        camera.height=SCREEN_HEIGHT;
+
+        camera.Refresh();      //更新矩阵计算
+    }
+
+    bool InitMaterial()
+    {
+        material=shader_manage->CreateMaterial(OS_TEXT("PositionColor3D.vert.spv"),
+                                               OS_TEXT("FlatColor.frag.spv"));
+        if(!material)
+            return(false);
+
+        descriptor_sets=material->CreateDescriptorSets();
+
+        db->Add(material);
+        db->Add(descriptor_sets);
+        return(true);
+    }
+
+    void CreateRenderObject()
+    {
+        {
+            struct PlaneGridCreateInfo pgci;
+
+            pgci.coord[0].Set(-100,-100,0);
+            pgci.coord[1].Set( 100,-100,0);
+            pgci.coord[2].Set( 100, 100,0);
+            pgci.coord[3].Set(-100, 100,0);
+
+            pgci.step.u=20;
+            pgci.step.v=20;
+
+            pgci.side_step.u=10;
+            pgci.side_step.v=10;
+
+            pgci.color.Set(0.75,0,0,1);
+            pgci.side_color.Set(1,0,0,1);
+
+            ro_plane_grid[0]=CreatePlaneGrid(db,material,&pgci);
+
+            pgci.color.Set(0,0.75,0,1);
+            pgci.side_color.Set(0,1,0,1);
+
+            ro_plane_grid[1]=CreatePlaneGrid(db,material,&pgci);
+
+            pgci.color.Set(0,0,0.75,1);
+            pgci.side_color.Set(0,0,1,1);
+            ro_plane_grid[2]=CreatePlaneGrid(db,material,&pgci);
+        }
+    }
+
+    bool InitUBO()
+    {
+        const VkExtent2D extent=device->GetExtent();
+
+        ubo_world_matrix=db->CreateUBO(sizeof(WorldMatrix),&camera.matrix);
+
+        if(!ubo_world_matrix)
+            return(false);
+
+        if(!descriptor_sets->BindUBO(material->GetUBO("world"),*ubo_world_matrix))
+            return(false);
+
+        descriptor_sets->Update();
+        return(true);
+    }
+
+    bool InitPipeline()
+    {
+        constexpr os_char PIPELINE_FILENAME[]=OS_TEXT("2DSolid.pipeline");
+
+        {
+            vulkan::PipelineCreater *pipeline_creater=new vulkan::PipelineCreater(device,material,device->GetRenderPass(),device->GetExtent());
+            pipeline_creater->SetDepthTest(true);
+            pipeline_creater->SetDepthWrite(true);
+            pipeline_creater->CloseCullFace();
+            pipeline_creater->Set(PRIM_LINES);
+
+            pipeline_line=pipeline_creater->Create();
+            if(!pipeline_line)
+                return(false);
+
+            db->Add(pipeline_line);
+
+            delete pipeline_creater;
+        }
+
+        return pipeline_line;
+    }
+
+    bool InitScene()
+    {
+        const float rad90=hgl_ang2rad(90);
+
+        render_root.Add(db->CreateRenderableInstance(pipeline_line,descriptor_sets,ro_plane_grid[0]));
+        render_root.Add(db->CreateRenderableInstance(pipeline_line,descriptor_sets,ro_plane_grid[1]),rotate(rad90,0,1,0));
+        render_root.Add(db->CreateRenderableInstance(pipeline_line,descriptor_sets,ro_plane_grid[2]),rotate(rad90,1,0,0));
+
+        render_root.RefreshMatrix();
+        render_root.ExpendToList(&render_list);
+
+        return(true);
+    }
+
+    bool InitCommandBuffer()
+    {
+        cmd_buf=hgl_zero_new<vulkan::CommandBuffer *>(swap_chain_count);
+
+        for(uint i=0;i<swap_chain_count;i++)
+        {
+            cmd_buf[i]=device->CreateCommandBuffer();
+
+            if(!cmd_buf[i])
+                return(false);
+
+            cmd_buf[i]->Begin();
+            cmd_buf[i]->BeginRenderPass(device->GetRenderPass(),device->GetFramebuffer(i));
+            render_list.Render(cmd_buf[i]);
+            cmd_buf[i]->EndRenderPass();
+            cmd_buf[i]->End();
+        }
+
+        return(true);
+    }
+
+public:
+
+    bool Init()
+    {
+        if(!VulkanApplicationFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT))
+            return(false);
+
+        swap_chain_count=device->GetSwapChainImageCount();
+
+        db=new SceneDB(device);
+
+        InitCamera();
+
+        if(!InitMaterial())
+            return(false);
+
+        CreateRenderObject();
+
+        if(!InitUBO())
+            return(false);
+
+        if(!InitPipeline())
+            return(false);
+
+        if(!InitScene())
+            return(false);
+
+        if(!InitCommandBuffer())
+            return(false);
+
+        return(true);
+    }
+
+    void Draw() override
+    {
+        const uint32_t frame_index=device->GetCurrentFrameIndices();
+
+        const vulkan::CommandBuffer *cb=cmd_buf[frame_index];
+
+        Submit(*cb);
+    }
+};//class TestApp:public VulkanApplicationFramework
+
+int main(int,char **)
+{
+    TestApp app;
+
+    if(!app.Init())
+        return(-1);
+
+    while(app.Run());
+
+    return 0;
+}