From f5414372a648dae96e85217f2d7a7b68d0cc08ad Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sat, 15 Jun 2019 12:14:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E9=94=AE=E7=9B=98=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E7=9A=84=E6=91=84=E5=83=8F=E6=9C=BA=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/Vulkan/VulkanAppFramework.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/example/Vulkan/VulkanAppFramework.h b/example/Vulkan/VulkanAppFramework.h index 07bea7b4..da64ac54 100644 --- a/example/Vulkan/VulkanAppFramework.h +++ b/example/Vulkan/VulkanAppFramework.h @@ -285,16 +285,8 @@ public: if(key_status[kbS])camera.Backward (move_speed);else if(key_status[kbA])camera.Left (move_speed);else if(key_status[kbD])camera.Right (move_speed);else - - if(key_status[kbLeft ])camera.WrapLeftRotate (move_speed);else - if(key_status[kbRight ])camera.WrapRightRotate(move_speed);else - if(key_status[kbUp ])camera.WrapUpRotate (move_speed);else - if(key_status[kbDown ])camera.WrapDownRotate (move_speed);else - - if(key_status[kbHome ])camera.ForwardRotate (move_speed);else - if(key_status[kbEnd ])camera.BackwardRotate (move_speed);else - if(key_status[kbDelete ])camera.LeftRotate (move_speed);else - if(key_status[kbPageDown])camera.RightRotate (move_speed);else + if(key_status[kbR])camera.Up (move_speed);else + if(key_status[kbF])camera.Down (move_speed);else return; } @@ -312,13 +304,13 @@ public: virtual void MouseMove() override { - if(!(mouse_key&mbLeft))return; + if(!(mouse_key&(mbLeft|mbRight)))return; Vector2f gap=mouse_pos-mouse_last_pos; bool update=false; - if(gap.x!=0){update=true;camera.LeftRotate(gap.x);} - if(gap.y!=0){update=true;camera.ForwardRotate(gap.y);} + if(gap.x!=0){update=true;if(mouse_key&mbLeft)camera.LeftRotate(gap.x);else camera.WrapRightRotate(gap.x);} + if(gap.y!=0){update=true;if(mouse_key&mbLeft)camera.ForwardRotate(gap.y);else camera.WrapUpRotate(gap.y);} mouse_last_pos=mouse_pos; }