split GestureLocationData (#2225)

* split LegacyGesture

* GestureLocationData

* use GestureLocationData

* remove _velocity

* remove _pressPosition

* remove PressTimestamp

* remove TouchLocation

* remove comment

* remove TouchLocationData.Invalid

* inline GestureLocationData.Invalid

* new GestureLocationData are allways Pressed

src/Xna.Framework.Input/Input/Touch/GestureLocationData.cs

@@ -0,0 +1,142 @@
+// Copyright (C)2025 Nick Kastellanos
+
+using System;
+using System.Diagnostics;
+
+namespace Microsoft.Xna.Framework.Input.Touch
+{
+
+    internal struct GestureLocationData : IEquatable<GestureLocationData>
+    {
+        private int _id;
+
+        internal TouchLocationState _state;
+        internal Vector2 _position;
+
+        internal TouchLocationState _previousState;
+        internal Vector2 _previousPosition;
+
+        internal Vector2 _velocity;
+        private Vector2 _pressPosition;
+        private TimeSpan _pressTimestamp;
+        internal TimeSpan _timestamp;
+
+        internal int _framestamp;
+
+        /// <summary>
+        /// True if this touch was pressed and released on the same frame.
+        /// In this case we will keep it around for the user to get by GetState that frame.
+        /// However if they do not call GetState that frame, this touch will be forgotten.
+        /// </summary>
+        internal bool SameFrameReleased;
+
+        internal int Id { get { return _id; } }
+        internal TouchLocationState State { get { return _state; } }
+        internal Vector2 Position { get { return _position; } }
+
+        internal Vector2 Velocity { get { return _velocity; } }
+        internal Vector2 PressPosition { get { return _pressPosition; } }
+        internal TimeSpan PressTimestamp { get { return _pressTimestamp; } }
+        internal TimeSpan Timestamp { get { return _timestamp; } }
+        internal int Framestamp { get { return _framestamp; } }
+
+
+        internal GestureLocationData(int id, TouchLocationState state, Vector2 position, TimeSpan timestamp, int framestamp)
+        {
+            _id = id;
+            _state = state;
+            _position = position;
+
+            _previousState = TouchLocationState.Invalid;
+            _previousPosition = Vector2.Zero;
+
+            _timestamp = timestamp;
+            _framestamp = framestamp;
+            _velocity = Vector2.Zero;
+
+            Debug.Assert(state == TouchLocationState.Pressed);
+            _pressPosition = position;
+            _pressTimestamp = timestamp;
+
+            SameFrameReleased = false;
+        }
+
+        public bool TryGetPreviousLocationData(out GestureLocationData aPreviousLocation)
+        {
+            if (_previousState == TouchLocationState.Invalid)
+            {
+                aPreviousLocation._id = -1;
+                aPreviousLocation._state = TouchLocationState.Invalid;
+                aPreviousLocation._position = Vector2.Zero;
+                aPreviousLocation._previousState = TouchLocationState.Invalid;
+                aPreviousLocation._previousPosition = Vector2.Zero;
+                aPreviousLocation._timestamp = TimeSpan.Zero;
+                aPreviousLocation._framestamp = 0;
+                aPreviousLocation._pressPosition = Vector2.Zero;
+                aPreviousLocation._pressTimestamp = TimeSpan.Zero;
+                aPreviousLocation._velocity = Vector2.Zero;
+                aPreviousLocation.SameFrameReleased = false;
+                return false;
+            }
+
+            aPreviousLocation._id = _id;
+            aPreviousLocation._state = _previousState;
+            aPreviousLocation._position = _previousPosition;
+            aPreviousLocation._previousState = TouchLocationState.Invalid;
+            aPreviousLocation._previousPosition = Vector2.Zero;
+            aPreviousLocation._timestamp = _timestamp;
+            aPreviousLocation._framestamp = _framestamp;
+            aPreviousLocation._pressPosition = _pressPosition;
+            aPreviousLocation._pressTimestamp = _pressTimestamp;
+            aPreviousLocation._velocity = _velocity;
+            aPreviousLocation.SameFrameReleased = SameFrameReleased;
+
+            return true;
+        }
+
+        public override int GetHashCode()
+        {
+            return _id;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is GestureLocationData)
+                return Equals((GestureLocationData)obj);
+
+            return false;
+        }
+
+        public bool Equals(GestureLocationData other)
+        {
+            return _id.Equals(other._id)
+                && _position.Equals(other._position)
+                && _previousPosition.Equals(other._previousPosition);
+        }
+
+        public static bool operator !=(GestureLocationData left, GestureLocationData right)
+        {
+            return left._id != right._id
+                || left._state != right._state
+                || left._position != right._position
+                || left._previousState != right._previousState
+                || left._previousPosition != right._previousPosition;
+        }
+
+        public static bool operator ==(GestureLocationData left, GestureLocationData right)
+        {
+            return left._id == right._id
+                && left._state == right._state
+                && left._position == right._position
+                && left._previousState == right._previousState
+                && left._previousPosition == right._previousPosition;
+        }
+
+        public override string ToString()
+        {
+            return String.Format("{{ Touch id: {0}, state: {1}, position: {2}, pressure: {3}, prevState: {4}, prevPosition: {5}, previousPressure: {6} }}",
+                _id, _state, _position, 0f, _previousState, _previousPosition, 0f);
+        }
+
+    }
+}

src/Xna.Framework.Input/Input/Touch/TouchLocationData.cs

@@ -15,11 +15,6 @@ internal struct TouchLocationData : IEquatable<TouchLocationData>
         internal TouchLocationState _previousState;
         internal Vector2 _previousPosition;
 
-
-        // Used for gesture recognition.
-        internal Vector2 _velocity;
-        private Vector2 _pressPosition;
-        private TimeSpan _pressTimestamp;
         internal TimeSpan _timestamp;
 
         internal int _framestamp;
@@ -31,18 +26,10 @@ internal struct TouchLocationData : IEquatable<TouchLocationData>
         /// </summary>
         internal bool SameFrameReleased;
 
-        /// <summary>
-        /// Helper for assigning an invalid touch location.
-        /// </summary>
-        internal static readonly TouchLocationData Invalid = new TouchLocationData();
-
         internal int Id { get { return _id; } }
         internal TouchLocationState State { get { return _state; } }
         internal Vector2 Position { get { return _position; } }
 
-        internal Vector2 Velocity { get { return _velocity; } }
-        internal Vector2 PressPosition { get { return _pressPosition; } }
-        internal TimeSpan PressTimestamp { get { return _pressTimestamp; } }
         internal TimeSpan Timestamp { get { return _timestamp; } }
         internal int Framestamp { get { return _framestamp; } }
 
@@ -70,20 +57,6 @@ internal TouchLocationData(int id, TouchLocationState state, Vector2 position, T
 
             _timestamp = timestamp;
             _framestamp = framestamp;
-            _velocity = Vector2.Zero;
-
-            // If this is a pressed location then store the 
-            // current position and timestamp as pressed.
-            if (state == TouchLocationState.Pressed)
-            {
-                _pressPosition = position;
-                _pressTimestamp = timestamp;
-            }
-            else
-            {
-                _pressPosition = Vector2.Zero;
-                _pressTimestamp = TimeSpan.Zero;
-            }
 
             SameFrameReleased = false;
         }
@@ -99,9 +72,6 @@ public bool TryGetPreviousLocationData(out TouchLocationData aPreviousLocation)
                 aPreviousLocation._previousPosition = Vector2.Zero;
                 aPreviousLocation._timestamp = TimeSpan.Zero;
                 aPreviousLocation._framestamp = 0;
-                aPreviousLocation._pressPosition = Vector2.Zero;
-                aPreviousLocation._pressTimestamp = TimeSpan.Zero;
-                aPreviousLocation._velocity = Vector2.Zero;
                 aPreviousLocation.SameFrameReleased = false;
                 return false;
             }
@@ -113,9 +83,6 @@ public bool TryGetPreviousLocationData(out TouchLocationData aPreviousLocation)
             aPreviousLocation._previousPosition = Vector2.Zero;
             aPreviousLocation._timestamp = _timestamp;
             aPreviousLocation._framestamp = _framestamp;
-            aPreviousLocation._pressPosition = _pressPosition;
-            aPreviousLocation._pressTimestamp = _pressTimestamp;
-            aPreviousLocation._velocity = _velocity;
             aPreviousLocation.SameFrameReleased = SameFrameReleased;
 
             return true;