From a290bcf11b7fcc028314d9011c9ed9bae25159fc Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Mon, 30 Dec 2024 21:17:35 +0100 Subject: [PATCH] Add AXIS_TAP_X_ABS & AXIS_TAP_Y_ABS --- openVulkanoCpp/Input/InputKey.hpp | 7 ++++++- openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp | 2 ++ openVulkanoCpp/Scene/SceneIntersectionTestController.cpp | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/openVulkanoCpp/Input/InputKey.hpp b/openVulkanoCpp/Input/InputKey.hpp index 8e37b7b..a528fb6 100644 --- a/openVulkanoCpp/Input/InputKey.hpp +++ b/openVulkanoCpp/Input/InputKey.hpp @@ -250,16 +250,21 @@ namespace OpenVulkano::Input enum Button: int16_t { BUTTON_TAP = 0, - BUTTON_TWO_FINGER_TAP + BUTTON_TWO_FINGER_TAP, + BUTTON_LAST = BUTTON_TWO_FINGER_TAP }; enum Axis : int16_t { AXIS_TAP_X = 0, AXIS_TAP_Y, + AXIS_TAP_X_ABS, + AXIS_TAP_Y_ABS, AXIS_TAP_DURATION, AXIS_TAP_TWO_FINGERS_X, AXIS_TAP_TWO_FINGERS_Y, + AXIS_TAP_TWO_FINGERS_X_ABS, + AXIS_TAP_TWO_FINGERS_Y_ABS, AXIS_TAP_TWO_FINGER_DURATION, AXIS_PAN_X, AXIS_PAN_Y, diff --git a/openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp b/openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp index 8c31340..e3a2663 100644 --- a/openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp +++ b/openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp @@ -194,6 +194,8 @@ namespace OpenVulkano::Input auto diff = m_nextTap - m_lastTap; m_axes[InputKey::Touch::Axis::AXIS_TAP_X] = diff.x; m_axes[InputKey::Touch::Axis::AXIS_TAP_Y] = diff.y; + m_axes[InputKey::Touch::Axis::AXIS_TAP_X_ABS] = m_nextTap.x; + m_axes[InputKey::Touch::Axis::AXIS_TAP_Y_ABS] = m_nextTap.y; m_lastTap = m_nextTap; // Pan diff --git a/openVulkanoCpp/Scene/SceneIntersectionTestController.cpp b/openVulkanoCpp/Scene/SceneIntersectionTestController.cpp index bb18d68..aa2a3bb 100644 --- a/openVulkanoCpp/Scene/SceneIntersectionTestController.cpp +++ b/openVulkanoCpp/Scene/SceneIntersectionTestController.cpp @@ -59,10 +59,10 @@ namespace OpenVulkano::Scene m_actionClick->BindKey(Input::InputKey::Touch::BUTTON_TAP); m_actionClickX = input->GetAction("ClickIntersectionPosX"); - m_actionClickX->BindKey(Input::InputKey::Touch::Axis::AXIS_TAP_X); + m_actionClickX->BindKey(Input::InputKey::Touch::Axis::AXIS_TAP_X_ABS); m_actionClickX->BindKey(Input::InputKey::Mouse::Axis::AXIS_X_ABS); m_actionClickY = input->GetAction("ClickIntersectionPosY"); - m_actionClickY->BindKey(Input::InputKey::Touch::Axis::AXIS_TAP_Y); + m_actionClickY->BindKey(Input::InputKey::Touch::Axis::AXIS_TAP_Y_ABS); m_actionClickY->BindKey(Input::InputKey::Mouse::Axis::AXIS_Y_ABS); } -} \ No newline at end of file +}