diff --git a/openVulkanoCpp/Controller/ArcballCameraController.cpp b/openVulkanoCpp/Controller/ArcballCameraController.cpp index 33bd384..d19c66b 100644 --- a/openVulkanoCpp/Controller/ArcballCameraController.cpp +++ b/openVulkanoCpp/Controller/ArcballCameraController.cpp @@ -61,10 +61,6 @@ namespace OpenVulkano Math::Vector3f_SIMD vec(input->GetAxis(m_actionSide), input->GetAxis(m_actionUp), -input->GetAxis(m_actionForward)); if (vec != Math::Vector3f_SIMD (0)) { - if (Math::Utils::length2(vec) > 1.0f) - { //TODO only do this for keyboards - //vec = Math::Utils::normalize(vec); - } const float timeScale = CURRENT_FRAME.frameTime; //TODO vec = vec * timeScale * m_movementSpeedModifier; // scale vector vec = GetCamera()->GetRotationMatrix() * Math::Vector3f(vec); diff --git a/openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp b/openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp index 07745c8..8c31340 100644 --- a/openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp +++ b/openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp @@ -18,10 +18,13 @@ namespace OpenVulkano::Input m_gestureProcessor.m_gestureTap.OnTap += EventHandler(this, &InputDeviceTouch::UpdateTap); m_gestureProcessor.m_gesturePan.OnPanStarted += EventHandler(this, &InputDeviceTouch::UpdatePanStarted); m_gestureProcessor.m_gesturePan.OnPanMoved += EventHandler(this, &InputDeviceTouch::UpdatePanMoved); + m_gestureProcessor.m_gesturePan.OnPanEnded += EventHandler(this, &InputDeviceTouch::UpdatePanStarted); m_gestureProcessor.m_gesturePanTwoFingers.OnPanStarted += EventHandler(this, &InputDeviceTouch::UpdatePanTwoFingersStarted); m_gestureProcessor.m_gesturePanTwoFingers.OnPanMoved += EventHandler(this, &InputDeviceTouch::UpdatePanTwoFingersMoved); + m_gestureProcessor.m_gesturePanTwoFingers.OnPanEnded += EventHandler(this, &InputDeviceTouch::UpdatePanTwoFingersStarted); m_gestureProcessor.m_gesturePinch.OnPinchStarted += EventHandler(this, &InputDeviceTouch::UpdatePinchStarted); m_gestureProcessor.m_gesturePinch.OnPinchMoved += EventHandler(this, &InputDeviceTouch::UpdatePinchMoved); + m_gestureProcessor.m_gesturePinch.OnPinchEnded += EventHandler(this, &InputDeviceTouch::UpdatePinchStarted); } decltype(InputDeviceTouch::m_touches)::iterator InputDeviceTouch::FindTouch(TouchId id)