From f76551018c6f995c7329d8fa0063d02552c1624d Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sat, 20 Jun 2020 14:45:39 +0800 Subject: [PATCH] update the codes of Camera --- CMPlatform | 2 +- CMSceneGraph | 2 +- example/Vulkan/ViewModelFramework.h | 10 +++++++--- example/Vulkan/VulkanAppFramework.h | 4 +--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMPlatform b/CMPlatform index 984d9698..9b1975a8 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit 984d9698ef873a08f0c99579e8a9b4bf15e5ce5f +Subproject commit 9b1975a8a5c74dfc5189b4d7f23d155b6e15cca8 diff --git a/CMSceneGraph b/CMSceneGraph index 7c4583fa..3714dd10 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 7c4583fa5b670c67f45d457f3ea2696a29f3819f +Subproject commit 3714dd1016363bb3c0791c33bc7e14cad672a810 diff --git a/example/Vulkan/ViewModelFramework.h b/example/Vulkan/ViewModelFramework.h index 9d21907f..a73ba8be 100644 --- a/example/Vulkan/ViewModelFramework.h +++ b/example/Vulkan/ViewModelFramework.h @@ -56,8 +56,12 @@ public: camera.type =CameraType::Perspective; camera.width =w; camera.height =h; + camera.vp_width =w; + camera.vp_height=h; camera.center =center_point; camera.eye =eye; + camera.znear =16; + camera.zfar =256; camera.Refresh(); //更新矩阵计算 @@ -86,10 +90,10 @@ public: { const uint32_t index=AcquireNextImage(); - camera.Refresh(); //更新相机矩阵 - ubo_world_matrix->Write(&camera.matrix); //写入缓冲区 +// camera.Refresh(); //更新相机矩阵 +// ubo_world_matrix->Write(&camera.matrix); //写入缓冲区 - render_root.RefreshMatrix(&object_matrix); + //render_root.RefreshMatrix(&object_matrix); render_list.Clear(); render_root.ExpendToList(&render_list); diff --git a/example/Vulkan/VulkanAppFramework.h b/example/Vulkan/VulkanAppFramework.h index f48e050a..9a3f46cc 100644 --- a/example/Vulkan/VulkanAppFramework.h +++ b/example/Vulkan/VulkanAppFramework.h @@ -307,9 +307,7 @@ public: camera.vp_width=w; camera.vp_height=h; camera.center.Set(0,0,0,1); - camera.eye.Set(100,100,100,1); //xyz三个值不要一样,以方便调试 - camera.znear=16; - camera.zfar=256; + camera.eye.Set(0,100,100,1); //xyz三个值不要一样,以方便调试 camera.Refresh(); //更新矩阵计算