From 5aded782e7d4be2153cc16a645a3b8c54ac3a110 Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Fri, 20 Oct 2023 16:19:21 +0200 Subject: [PATCH] Update touch inputs --- .../Controller/FreeCamCameraController.cpp | 8 ++--- openVulkanoCpp/Input/Touch/GesturePinch.cpp | 31 ++++--------------- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/openVulkanoCpp/Controller/FreeCamCameraController.cpp b/openVulkanoCpp/Controller/FreeCamCameraController.cpp index cefbb0c..89342a1 100644 --- a/openVulkanoCpp/Controller/FreeCamCameraController.cpp +++ b/openVulkanoCpp/Controller/FreeCamCameraController.cpp @@ -40,8 +40,8 @@ namespace OpenVulkano vec *= m_boostFactor; } - m_yaw -= input->GetAxis(m_actionLookSide) * timeScale / 2.0; - m_pitch -= input->GetAxis(m_actionLookUp) * timeScale / 2.0; + m_yaw -= input->GetAxis(m_actionLookSide) * timeScale / 2.0f; + m_pitch -= input->GetAxis(m_actionLookUp) * timeScale / 2.0f; m_pitch = std::min(1.4f, std::max(-1.4f, m_pitch)); const Math::QuaternionF rot(Math::Vector3f(m_pitch, m_yaw, 0)); @@ -55,10 +55,10 @@ namespace OpenVulkano { m_actionForward->BindKey(Input::InputKey::Controller::AXIS_LEFT_Y); m_actionForward->BindAxisButtons(Input::InputKey::Keyboard::KEY_W, Input::InputKey::Keyboard::KEY_S); - m_actionForward->BindKey(Input::InputKey::Touch::AXIS_PAN_TWO_FINGERS_Y, -0.01f); + m_actionForward->BindKey(Input::InputKey::Touch::AXIS_PAN_TWO_FINGERS_Y, -0.0025f); m_actionSide->BindKey(Input::InputKey::Controller::AXIS_LEFT_X); m_actionSide->BindAxisButtons(Input::InputKey::Keyboard::KEY_D, Input::InputKey::Keyboard::KEY_A); - m_actionSide->BindKey(Input::InputKey::Touch::AXIS_PAN_TWO_FINGERS_X, 0.01f); + m_actionSide->BindKey(Input::InputKey::Touch::AXIS_PAN_TWO_FINGERS_X, 0.0025f); m_actionLookUp->BindKey(Input::InputKey::Controller::AXIS_RIGHT_Y); m_actionLookUp->BindAxisButtons(Input::InputKey::Keyboard::KEY_DOWN, Input::InputKey::Keyboard::KEY_UP); m_actionLookUp->BindKey(Input::InputKey::Touch::AXIS_PAN_Y, 0.10f); diff --git a/openVulkanoCpp/Input/Touch/GesturePinch.cpp b/openVulkanoCpp/Input/Touch/GesturePinch.cpp index 0e59984..85358e6 100644 --- a/openVulkanoCpp/Input/Touch/GesturePinch.cpp +++ b/openVulkanoCpp/Input/Touch/GesturePinch.cpp @@ -54,17 +54,9 @@ namespace OpenVulkano::Input } m_initialDistance = distance; - - if (m_initialDistance > 0) - { - m_pinchInfo.scale = m_initialDistance; - m_pinchInfo.position = CalculateCenter(); - } - else - { - m_pinchInfo.scale = 0.0f; - m_pinchInfo.position = m_pendingTouches.front().currentPosition; - } + + m_pinchInfo.scale = 0; + m_pinchInfo.position = CalculateCenter(); OnPinchStarted.NotifyAll(this, m_pinchInfo); @@ -202,21 +194,10 @@ namespace OpenVulkano::Input { float newDistance = CalculateDistance(); - if (m_lastDistance == 0) - { - m_lastDistance = newDistance; - } + if (m_lastDistance == 0) m_lastDistance = newDistance; - if (m_initialDistance > 0) - { - m_pinchInfo.scale = (newDistance - m_initialDistance); - m_pinchInfo.position = CalculateCenter(); - } - else - { - m_pinchInfo.scale = 0.0f; - m_pinchInfo.position = m_pendingTouches.front().currentPosition; - } + m_pinchInfo.scale = (newDistance - m_initialDistance); + m_pinchInfo.position = CalculateCenter(); OnPinchMoved.NotifyAll(this, m_pinchInfo);