From 315523462923e4fc9fb657ef74cf3b0f7ecbce9e Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Tue, 28 May 2019 22:04:29 +0800
Subject: [PATCH] =?UTF-8?q?Geometry3D=E8=8C=83=E4=BE=8B=E6=94=B9=E8=BF=9B(?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90,=E4=B8=8D=E5=8F=AF=E7=94=A8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/Vulkan/Geometry3D.cpp | 42 ++++++++++++++---------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/example/Vulkan/Geometry3D.cpp b/example/Vulkan/Geometry3D.cpp
index d26801ba..719c039c 100644
--- a/example/Vulkan/Geometry3D.cpp
+++ b/example/Vulkan/Geometry3D.cpp
@@ -16,11 +16,6 @@ bool LoadFromFile(const OSString &filename,VK_NAMESPACE::PipelineCreater *pc);
 constexpr uint32_t SCREEN_WIDTH=128;
 constexpr uint32_t SCREEN_HEIGHT=128;
 
-struct WorldConfig
-{
-    Matrix4f mvp;
-}world;
-
 class TestApp:public VulkanApplicationFramework
 {
 private:
@@ -70,8 +65,6 @@ private:
         camera.height=SCREEN_HEIGHT;
 
         camera.Refresh();      //更新矩阵计算
-
-        world.mvp=camera.projection*camera.modelview*scale(50,50,50);
     }
 
     bool InitMaterial()
@@ -114,21 +107,21 @@ private:
         }
     }
 
-    bool InitUBO()
-    {
-        const VkExtent2D extent=device->GetExtent();
+    //bool InitUBO()
+    //{
+    //    const VkExtent2D extent=device->GetExtent();
 
-        ubo_mvp=db->CreateUBO(sizeof(WorldConfig),&world);
+    //    ubo_mvp=db->CreateUBO(sizeof(WorldConfig),&world);
 
-        if(!ubo_mvp)
-            return(false);
+    //    if(!ubo_mvp)
+    //        return(false);
 
-        if(!descriptor_sets->BindUBO(material->GetUBO("world"),*ubo_mvp))
-            return(false);
+    //    if(!descriptor_sets->BindUBO(material->GetUBO("world"),*ubo_mvp))
+    //        return(false);
 
-        descriptor_sets->Update();
-        return(true);
-    }
+    //    descriptor_sets->Update();
+    //    return(true);
+    //}
 
     bool InitPipeline()
     {
@@ -163,13 +156,12 @@ private:
 
     bool InitScene()
     {
-        //render_root.Add(db->CreateRenderableInstance(pipeline_line,descriptor_sets,ro_plane_grid));
-        render_root.Add(db->CreateRenderableInstance(pipeline_triangles,descriptor_sets,ro_cube));
+        render_root.Add(db->CreateRenderableInstance(pipeline_line,descriptor_sets,ro_plane_grid));
+        
+        render_root.Add(db->CreateRenderableInstance(pipeline_triangles,descriptor_sets,ro_cube),scale(50,50,50));
         //render_root.Add(db->CreateRenderableInstance(pipeline,descriptor_sets,ro_circle));
 
-        Matrix4f s10=scale(10,10,10);
-
-        render_root.RefreshMatrix();
+        render_root.RefreshMatrix(&(camera.mvp));
         render_root.ExpendToList(&render_list);
 
         return(true);
@@ -214,8 +206,8 @@ public:
 
         CreateRenderObject();
 
-        if(!InitUBO())
-            return(false);
+//        if(!InitUBO())
+//            return(false);
 
         if(!InitPipeline())
             return(false);