diff --git a/openVulkanoCpp/Input/Touch/GestureProcessor.cpp b/openVulkanoCpp/Input/Touch/GestureProcessor.cpp index 4c1b568..6c1cade 100644 --- a/openVulkanoCpp/Input/Touch/GestureProcessor.cpp +++ b/openVulkanoCpp/Input/Touch/GestureProcessor.cpp @@ -43,7 +43,7 @@ namespace OpenVulkano::Input Logger::INPUT->debug("Replacing pan with multitouch gesture"); return ConflictResult::NewGesture; } - return ConflictResult::ExistingGesture; + return ConflictResult::BothGestures; }; } diff --git a/openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp b/openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp index 1019193..07745c8 100644 --- a/openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp +++ b/openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp @@ -201,7 +201,7 @@ namespace OpenVulkano::Input diff = m_next2FPanInfo.position - m_last2FPanInfo.position; m_axes[InputKey::Touch::Axis::AXIS_PAN_TWO_FINGERS_X] = diff.x; m_axes[InputKey::Touch::Axis::AXIS_PAN_TWO_FINGERS_Y] = diff.y; - m_next2FPanInfo = m_last2FPanInfo; + m_last2FPanInfo = m_next2FPanInfo; // Pinch m_axes[InputKey::Touch::Axis::AXIS_PINCH] = m_nextPinchInfo.scale - m_lastPinchInfo.scale;