Merge branch 'develop' into isxb-656-fix-for-auto-schemes-switching-with-onscreen-components

Author: bmalrat

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -11,6 +11,7 @@ however, it has to be formatted properly to pass verification tests.
 ## [Unreleased] - yyyy-mm-dd
 
 ### Fixed
+- Fixed touch pointers being released twice causing an index out of bounds error. [ISXB-687](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-687)
 - Fixed `NullReferenceException` from disconnecting and reconnecting a GXDKGamepad.
 - Fixed wrong mapping of Xbox Series S|X and Xbox One wireless controllers "View" button on macOS.[ISXB-385](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-385)
 - Fixed unexpected control scheme switch when using `OnScreenControl` and pointer based schemes which registed "Cancel" event on every frame.[ISXB-656](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-656)
@@ -31,6 +32,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed "MissingReferenceException" errors when closing an in-game dropdown field [ISXB-1081](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1081).
 - Fixed potential crash on Mac when using stale references to deleted InputDevice objects [ISXB-606](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-606).
 - Fixed conditional compilation for non-editor analytics on platforms not enabling analytics.
+- Fixed simulated touch input not working with PlayerInput component [ISXB-483](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-483).
 
 ### Changed
 - Renamed editor Resources directories to PackageResources to fix package validation warnings.

Packages/com.unity.inputsystem/InputSystem/Plugins/EnhancedTouch/TouchSimulation.cs

@@ -121,6 +121,12 @@ protected void RemovePointer(Pointer pointer)
 
         private unsafe void OnEvent(InputEventPtr eventPtr, InputDevice device)
         {
+            if (device == simulatedTouchscreen)
+            {
+                // Avoid processing events queued by this simulation device
+                return;
+            }
+
             var pointerIndex = m_Pointers.IndexOfReference(device, m_NumPointers);
             if (pointerIndex < 0)
                 return;
@@ -129,9 +135,6 @@ private unsafe void OnEvent(InputEventPtr eventPtr, InputDevice device)
             if (eventType != StateEvent.Type && eventType != DeltaStateEvent.Type)
                 return;
 
-            ////TODO: this can be simplified if we use events instead of InputState.Change() but doing so requires work on buffering events while processing; also
-            ////       needs extra handling to not lag into the next frame
-
             ////REVIEW: should we have specialized paths for MouseState and PenState here? (probably can only use for StateEvents)
 
             Pointer pointer = m_Pointers[pointerIndex];
@@ -254,6 +257,9 @@ protected void OnEnable()
             if (m_Touches == null)
                 m_Touches = new ButtonControl[simulatedTouchscreen.touches.Count];
 
+            if (m_TouchIds == null)
+                m_TouchIds = new int[simulatedTouchscreen.touches.Count];
+
             foreach (var device in InputSystem.devices)
                 OnDeviceChange(device, InputDeviceChange.Added);
 
@@ -280,7 +286,6 @@ protected void OnDisable()
 
             m_NumPointers = 0;
             m_LastTouchId = 0;
-            m_PrimaryTouchIndex = -1;
 
             InputSystem.onDeviceChange -= m_OnDeviceChange;
             InputSystem.onEvent -= m_OnEvent;
@@ -292,55 +297,34 @@ private unsafe void UpdateTouch(int touchIndex, int pointerIndex, TouchPhase pha
             Debug.Assert(m_CurrentDisplayIndices[pointerIndex] <= byte.MaxValue, "Display index was larger than expected");
             byte displayIndex = (byte)m_CurrentDisplayIndices[pointerIndex];
 
+            // We need to partially set TouchState in a similar way that the Native side would do, but deriving that
+            // data from the Pointer events.
+            // The handling of the remaining fields is done by the Touchscreen.OnStateEvent() callback.
             var touch = new TouchState
             {
                 phase = phase,
                 position = position,
                 displayIndex = displayIndex
             };
-            var time = eventPtr.valid ? eventPtr.time : InputState.currentTime;
-
-            var oldTouchState = (TouchState*)((byte*)simulatedTouchscreen.currentStatePtr +
-                simulatedTouchscreen.touches[touchIndex].stateBlock.byteOffset);
 
             if (phase == TouchPhase.Began)
             {
-                touch.isPrimaryTouch = m_PrimaryTouchIndex < 0;
-                touch.startTime = time;
+                touch.startTime = eventPtr.valid ? eventPtr.time : InputState.currentTime;
                 touch.startPosition = position;
                 touch.touchId = ++m_LastTouchId;
-                touch.tapCount = oldTouchState->tapCount; // Get reset automatically by Touchscreen.
-
-                if (touch.isPrimaryTouch)
-                    m_PrimaryTouchIndex = touchIndex;
+                m_TouchIds[touchIndex] = m_LastTouchId;
             }
             else
             {
-                touch.touchId = oldTouchState->touchId;
-                touch.isPrimaryTouch = m_PrimaryTouchIndex == touchIndex;
-                touch.delta = position - oldTouchState->position;
-                touch.startPosition = oldTouchState->startPosition;
-                touch.startTime = oldTouchState->startTime;
-                touch.tapCount = oldTouchState->tapCount;
-
-                if (phase == TouchPhase.Ended)
-                {
-                    touch.isTap = time - oldTouchState->startTime <= Touchscreen.s_TapTime &&
-                        (position - oldTouchState->startPosition).sqrMagnitude <= Touchscreen.s_TapRadiusSquared;
-                    if (touch.isTap)
-                        ++touch.tapCount;
-                }
+                touch.touchId = m_TouchIds[touchIndex];
             }
 
-            if (touch.isPrimaryTouch)
-                InputState.Change(simulatedTouchscreen.primaryTouch, touch, eventPtr: eventPtr);
-            InputState.Change(simulatedTouchscreen.touches[touchIndex], touch, eventPtr: eventPtr);
+            //NOTE: Processing these events still happen in the current frame.
+            InputSystem.QueueStateEvent(simulatedTouchscreen, touch);
 
             if (phase.IsEndedOrCanceled())
             {
                 m_Touches[touchIndex] = null;
-                if (m_PrimaryTouchIndex == touchIndex)
-                    m_PrimaryTouchIndex = -1;
             }
         }
 
@@ -349,9 +333,9 @@ private unsafe void UpdateTouch(int touchIndex, int pointerIndex, TouchPhase pha
         [NonSerialized] private Vector2[] m_CurrentPositions;
         [NonSerialized] private int[] m_CurrentDisplayIndices;
         [NonSerialized] private ButtonControl[] m_Touches;
+        [NonSerialized] private int[] m_TouchIds;
 
         [NonSerialized] private int m_LastTouchId;
-        [NonSerialized] private int m_PrimaryTouchIndex = -1;
         [NonSerialized] private Action<InputDevice, InputDeviceChange> m_OnDeviceChange;
         [NonSerialized] private Action<InputEventPtr, InputDevice> m_OnEvent;
 

Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs

@@ -1947,6 +1947,13 @@ private void RemovePointerAtIndex(int index)
         {
             Debug.Assert(m_PointerStates[index].eventData.pointerEnter == null, "Pointer should have exited all objects before being removed");
 
+            // We don't want to release touch pointers on the same frame they are released (unpressed). They get cleaned up one frame later in Process()
+            ref var state = ref GetPointerStateForIndex(index);
+            if (state.pointerType == UIPointerType.Touch && (state.leftButton.isPressed || state.leftButton.wasReleasedThisFrame))
+            {
+                return;
+            }
+
             // Retain event data so that we can reuse the event the next time we allocate a PointerModel record.
             var eventData = m_PointerStates[index].eventData;
             Debug.Assert(eventData != null, "Pointer state should have an event instance!");
@@ -2209,7 +2216,13 @@ private void FilterPointerStatesByType()
                     // We have input on a mouse or pen. Kill all touch and tracked pointers we may have.
                     for (var i = 0; i < m_PointerStates.length; ++i)
                     {
-                        if (m_PointerStates[i].pointerType != UIPointerType.MouseOrPen)
+                        ref var state = ref GetPointerStateForIndex(i);
+                        // Touch pointers need to get forced to no longer be pressed otherwise they will not get released in subsequent frames.
+                        if (m_PointerStates[i].pointerType == UIPointerType.Touch)
+                        {
+                            state.leftButton.isPressed = false;
+                        }
+                        if (m_PointerStates[i].pointerType != UIPointerType.MouseOrPen && m_PointerStates[i].pointerType != UIPointerType.Touch || (m_PointerStates[i].pointerType == UIPointerType.Touch && !state.leftButton.isPressed && !state.leftButton.wasReleasedThisFrame))
                         {
                             SendPointerExitEventsAndRemovePointer(i);
                             --i;