Fix pinch gesture

openVulkanoCpp/Input/Touch/GesturePan.cpp

@@ -132,7 +132,7 @@ namespace OpenVulkano::Input
 
 	void GesturePan::TouchMoved(const Touch& touch)
 	{
-		if (m_pendingTouches.size() > 0)
+		if (!m_pendingTouches.empty())
 		{
 			bool isPending = false;
 			bool isActive = false;

openVulkanoCpp/Input/Touch/GesturePinch.cpp

@@ -12,6 +12,7 @@ namespace OpenVulkano::Input
 	{
 		constexpr float MIN_DISTANCE = 2;
 		constexpr float MIN_DISTANCE2 = MIN_DISTANCE * MIN_DISTANCE;
+		constexpr float START_DISTANCE = 400;
 		constexpr uint32_t REQUIRED_TOUCHES = 2;
 	}
 
@@ -45,31 +46,29 @@ namespace OpenVulkano::Input
 			if (!IsActive())
 			{
 				SetActive(true);
-
-				m_initialDistance = CalculateDistance();
-
-				float newDistance = m_initialDistance;
-
+				float distance = CalculateDistance();
+				if (distance < START_DISTANCE)
+				{
+					SetActive(false);
+					return;
+				}
+					
+				m_initialDistance = distance;
+				
 				if (m_initialDistance > 0)
 				{
-					m_pinchInfo.scale = newDistance > 0 ? m_initialDistance / newDistance : m_lastDistance;
+					m_pinchInfo.scale = m_initialDistance;
 					m_pinchInfo.position = CalculateCenter();
 				}
 				else
 				{
-					m_pinchInfo.scale = 1.0f;
+					m_pinchInfo.scale = 0.0f;
 					m_pinchInfo.position = m_pendingTouches.front().currentPosition;
 				}
 
-				if (m_lastDistance == 0)
-				{
-					m_lastDistance = newDistance;
-				}
-
-				// fire event
 				OnPinchStarted.NotifyAll(this, m_pinchInfo);
 
-				m_lastDistance = newDistance;
+				m_lastDistance = m_initialDistance;
 			}
 			else
 			{
@@ -78,11 +77,10 @@ namespace OpenVulkano::Input
 		}
 	}
 
-	float GesturePinch::LinearLength(const std::vector<Math::Vector2f>& points) const
+	float GesturePinch::LinearLength(const std::vector<Math::Vector2f>& points)
 	{
+		if (points.size() < 2) return 0;
 		auto start = points.begin();
-		if (start == points.end()) return 0;
-
 		auto finish = start + 1;
 		float sum = 0;
 
@@ -112,17 +110,21 @@ namespace OpenVulkano::Input
 
 	Math::Vector2f GesturePinch::CalculateCenter() const
 	{
-		auto center = Math::Vector2f();
+		Math::Vector2f center(0);
 		if (m_pendingTouches.size() >= REQUIRED_TOUCHES && IsActive() && !m_paused)
 		{
-			std::vector<Math::Vector2f> positions;
+			int count = 0;
 			for (const auto& t : m_pendingTouches)
 			{
-				if (t.active) positions.push_back(t.currentPosition);
+				if (t.active)
+				{
+					center += t.currentPosition;
+					count++;
+				}
 			}
-			for (const auto& position : positions)
+			if (count)
 			{
-				center += position / (float)positions.size();
+				center /= count;
 			}
 		}
 		return center;
@@ -138,6 +140,7 @@ namespace OpenVulkano::Input
 		m_paused = false;
 		OnPinchEnded.NotifyAll(this, m_pinchInfo);
 		m_pinchInfo.position = {};
+		m_pinchInfo.scale = 0.0f;
 	}
 
 	void GesturePinch::TouchDown(const Touch& touch)
@@ -206,12 +209,12 @@ namespace OpenVulkano::Input
 
 					if (m_initialDistance > 0)
 					{
-						m_pinchInfo.scale = newDistance > 0 ? m_initialDistance / newDistance : m_lastDistance;
+						m_pinchInfo.scale = (newDistance - m_initialDistance);
 						m_pinchInfo.position = CalculateCenter();
 					}
 					else
 					{
-						m_pinchInfo.scale = 1.0f;
+						m_pinchInfo.scale = 0.0f;
 						m_pinchInfo.position = m_pendingTouches.front().currentPosition;
 					}
 
@@ -241,4 +244,4 @@ namespace OpenVulkano::Input
 			if (m_pendingTouches.empty() && IsActive()) Cancel();
 		}
 	}
-}
+}

openVulkanoCpp/Input/Touch/GesturePinch.hpp

@@ -22,7 +22,7 @@ namespace OpenVulkano::Input
 
 		void TryStart();
 
-		float LinearLength(std::vector<Math::Vector2f> const &points) const;
+		static float LinearLength(std::vector<Math::Vector2f> const &points) ;
 
 		float CalculateDistance() const;
 

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::BothGestures;
+			return ConflictResult::ExistingGesture;
 		};
 	}
 

openVulkanoCpp/Input/Touch/InputDeviceTouch.cpp

@@ -204,9 +204,10 @@ namespace OpenVulkano::Input
 		m_next2FPanInfo = m_last2FPanInfo;
 
 		// Pinch
-		m_axes[InputKey::Touch::Axis::AXIS_PINCH] = m_nextPinchInfo.scale;
+		m_axes[InputKey::Touch::Axis::AXIS_PINCH] = m_nextPinchInfo.scale - m_lastPinchInfo.scale;
 		diff = m_nextPinchInfo.position - m_lastPinchInfo.position;
 		m_axes[InputKey::Touch::Axis::AXIS_PINCH_CENTER_X] = diff.x;
 		m_axes[InputKey::Touch::Axis::AXIS_PINCH_CENTER_Y] = diff.y;
+		m_lastPinchInfo = m_nextPinchInfo;
 	}
-}
+}