From 31af8cc92b47b651a85c5f2f472e6ffa77785d8c Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 27 Jan 2022 10:48:20 +0800 Subject: [PATCH] deleteed OnWheel at CameraAppFramework --- CMCore | 2 +- CMSceneGraph | 2 +- example/common/VulkanAppFramework.h | 8 +------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CMCore b/CMCore index d370342a..9a74f172 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit d370342a981009fe9384bfb95517e9b0874a1c55 +Subproject commit 9a74f1722c9bace16ecc6801da59b1316112f548 diff --git a/CMSceneGraph b/CMSceneGraph index 2a995f47..92eb68e7 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 2a995f47f5cac7b721ca3ceeb2d14a4dd2affb6f +Subproject commit 92eb68e7d030055287c97c3f31c3b1a822ab25d0 diff --git a/example/common/VulkanAppFramework.h b/example/common/VulkanAppFramework.h index 4663349e..ccd3261f 100644 --- a/example/common/VulkanAppFramework.h +++ b/example/common/VulkanAppFramework.h @@ -350,7 +350,7 @@ protected: Vector2f pos(x,y); Vector2f gap=pos-mouse_last_pos; - camera->Rotate(gap,(cur_time-last_time)*5); + camera->Rotate(gap/180.0f,(cur_time-last_time)*5); last_time=cur_time; mouse_last_pos=Vector2f(x,y); @@ -359,12 +359,6 @@ protected: return(true); } - bool OnWheel(int x,int y) - { - camera->Distance(y>1.0f?1.1f:0.9f); - return(true); - } - public: CameraMouseControl(FirstPersonCameraControl *wc)