FIX: PressInteraction missing presses when reset from callback (case 1205285, #1064).

Author: Rene Damm

Assets/Tests/InputSystem/CoreTests_Actions_Interactions.cs

@@ -1,10 +1,10 @@
 using System.Linq;
 using NUnit.Framework;
+using UnityEngine;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Interactions;
 using UnityEngine.InputSystem.LowLevel;
 using UnityEngine.InputSystem.Utilities;
-using UnityEngine.InputSystem.XR;
 using UnityEngine.Scripting;
 
 internal partial class CoreTests
@@ -190,6 +190,47 @@ public void Actions_CanPerformPressInteraction()
         }
     }
 
+    // https://fogbugz.unity3d.com/f/cases/1205285/
+    [Test]
+    [Category("Actions")]
+    public void Actions_CanPerformPressInteraction_AndTriggerInteractionResetInCallback()
+    {
+        var keyboard = InputSystem.AddDevice<Keyboard>();
+
+        var asset = ScriptableObject.CreateInstance<InputActionAsset>();
+        var map1 = new InputActionMap("map1");
+        var map2 = new InputActionMap("map2");
+        asset.AddActionMap(map1);
+        asset.AddActionMap(map2);
+
+        var action1 = map1.AddAction("action1");
+        var action2 = map2.AddAction("action2");
+        // PressInteraction used to set some local state *after* trigger callbacks. This meant that if the
+        // callback triggered a Reset() call, PressInteraction would then overwrite state from the reset.
+        action1.AddBinding("<Keyboard>/a", interactions: "press(behavior=0)");
+        action2.AddBinding("<Keyboard>/b", interactions: "press(behavior=0)");
+
+        action1.performed += _ => { map1.Disable(); map2.Enable(); };
+        action2.performed += _ => { map2.Disable(); map1.Enable(); };
+
+        map1.Enable();
+
+        PressAndRelease(keyboard.aKey);
+
+        Assert.That(map1.enabled, Is.False);
+        Assert.That(map2.enabled, Is.True);
+
+        PressAndRelease(keyboard.bKey);
+
+        Assert.That(map1.enabled, Is.True);
+        Assert.That(map2.enabled, Is.False);
+
+        PressAndRelease(keyboard.aKey);
+
+        Assert.That(map1.enabled, Is.False);
+        Assert.That(map2.enabled, Is.True);
+    }
+
     [Test]
     [Category("Actions")]
     public void Actions_CanPerformHoldInteraction()

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -16,6 +16,7 @@ however, it has to be formatted properly to pass verification tests.
 - Mixing the enabling&disabling of single actions (as, for example, performed by `InputSystemUIInputModule`) with enabling&disabling of entire action maps (as, for example, performed by `PlayerInput`) no longer leaves to unresponsive input and `"should not reach here"` assertions ([forum thread](https://forum.unity.com/threads/error-while-switching-between-action-maps.825204/)).
 - Leaving play mode no longer leaves state change monitors lingering around from enabled actions.
 - Enabling action maps with bindings that do not refer to an existing action in the map no longer leads to asserts and exceptions when input on the bindings is received ([case 1213085](https://issuetracker.unity3d.com/issues/input-system-input-actions-cause-exceptions-and-should-not-get-here-errors-to-appear-after-deleting-an-action-map)).
+- `PressInteraction` no longer misses the next button press if it gets reset from within the `performed` callback ([case 1205285](https://issuetracker.unity3d.com/issues/inputsystem-problem-with-button-state-after-deactivating-and-reactivating-an-action-map)).
 
 ## [1.0.0-preview.5] - 2020-02-14
 

Packages/com.unity.inputsystem/InputSystem/Actions/Interactions/PressInteraction.cs

@@ -74,8 +74,8 @@ public void Process(ref InputInteractionContext context)
                     }
                     else if (isActuated)
                     {
-                        context.PerformedAndStayPerformed();
                         m_WaitingForRelease = true;
+                        context.PerformedAndStayPerformed();
                     }
                     break;
 
@@ -88,25 +88,25 @@ public void Process(ref InputInteractionContext context)
                     }
                     else if (isActuated)
                     {
-                        context.Started();
                         m_WaitingForRelease = true;
+                        context.Started();
                     }
                     break;
 
                 case PressBehavior.PressAndRelease:
                     if (m_WaitingForRelease)
                     {
+                        m_WaitingForRelease = isActuated;
                         if (!isActuated)
                         {
                             context.Performed();
                             context.Canceled();
                         }
-                        m_WaitingForRelease = isActuated;
                     }
                     else if (isActuated)
                     {
-                        context.PerformedAndStayPerformed();
                         m_WaitingForRelease = true;
+                        context.PerformedAndStayPerformed();
                     }
                     break;
             }