FIX: Fixed a bug where multiple composite bindings for the same contr… (#883)

Author: jechter

Assets/Tests/InputSystem/CoreTests_Actions.cs

@@ -5075,6 +5075,69 @@ public void Actions_CompositesReportControlThatTriggeredTheCompositeInCallback()
         LogAssert.NoUnexpectedReceived();
     }
 
+    [Test]
+    [Category("Actions")]
+    // Test for case 1183314
+    public void Actions_CompositesInDifferentMapsTiedToSameControlsWork()
+    {
+        var keyboard = InputSystem.AddDevice<Keyboard>();
+        var gamepad = InputSystem.AddDevice<Gamepad>();
+
+        InputSystem.RegisterInteraction<LogInteraction>();
+
+        var map1 = new InputActionMap("map1");
+        var action1 = map1.AddAction("action");
+        action1.AddBinding("<Gamepad>/leftStick");
+        action1.AddCompositeBinding("Dpad")
+            .With("Up", "<Keyboard>/w")
+            .With("Down", "<Keyboard>/s")
+            .With("Left", "<Keyboard>/a")
+            .With("Right", "<Keyboard>/d");
+        var map2 = new InputActionMap("map2");
+        var action2 = map2.AddAction("action");
+        action2.AddBinding("<Gamepad>/leftStick");
+        action2.AddCompositeBinding("Dpad")
+            .With("Up", "<Keyboard>/w")
+            .With("Down", "<Keyboard>/s")
+            .With("Left", "<Keyboard>/a")
+            .With("Right", "<Keyboard>/d");
+
+        var asset = ScriptableObject.CreateInstance<InputActionAsset>();
+        asset.AddActionMap(map1);
+        asset.AddActionMap(map2);
+        asset.Enable();
+
+
+        InputControl performedControl1 = null;
+        InputControl performedControl2 = null;
+        action1.performed += ctx => performedControl1 = ctx.control;
+        action2.performed += ctx => performedControl2 = ctx.control;
+
+        InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.A));
+        InputSystem.Update();
+
+        Assert.That(performedControl1, Is.EqualTo(keyboard.aKey));
+        performedControl1 = null;
+        Assert.That(performedControl2, Is.EqualTo(keyboard.aKey));
+        performedControl2 = null;
+
+        InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.A, Key.W));
+        InputSystem.Update();
+
+        Assert.That(performedControl1, Is.EqualTo(keyboard.wKey));
+        performedControl1 = null;
+        Assert.That(performedControl2, Is.EqualTo(keyboard.wKey));
+        performedControl2 = null;
+
+        InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.A));
+        InputSystem.Update();
+
+        InputSystem.QueueStateEvent(keyboard, new KeyboardState());
+        InputSystem.Update();
+
+        LogAssert.NoUnexpectedReceived();
+    }
+
     [Preserve]
     private class CompositeWithVector2Part : InputBindingComposite<Vector2>
     {

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -14,6 +14,10 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed a bug where the Input Settings Window might throw exceptions after assembly reload.
 - Correctly implemented `IsPointerOverGameObject` method for `InputSystemUIInputModule`.
 
+### Actions
+
+- Fixed a bug where multiple composite bindings for the same controls but on different action maps would throw exceptions.
+
 ## [1.0.0-preview] - 2019-9-20
 
 ### Fixed

Packages/com.unity.inputsystem/InputSystem/Actions/InputBindingResolver.cs

@@ -497,8 +497,8 @@ public unsafe void AddActionMap(InputActionMap map)
                     }
                     Debug.Assert(bindingStartIndexForAction < ushort.MaxValue, "Binding start index on action exceeds limit");
                     Debug.Assert(bindingCountForAction < ushort.MaxValue, "Binding count on action exceeds limit");
-                    newMemory.actionBindingIndicesAndCounts[i * 2] = (ushort)bindingStartIndexForAction;
-                    newMemory.actionBindingIndicesAndCounts[i * 2 + 1] = (ushort)bindingCountForAction;
+                    newMemory.actionBindingIndicesAndCounts[actionIndex * 2] = (ushort)bindingStartIndexForAction;
+                    newMemory.actionBindingIndicesAndCounts[actionIndex * 2 + 1] = (ushort)bindingCountForAction;
 
                     // See if we may need conflict resolution on this action. Never needed for pass-through actions.
                     // Otherwise, if we have more than one bound control or have several bindings and one of them