FIX: InlinedArray.RemoveAt sometimes removing the wrong element (case 1196143, #945).

Author: Rene Damm

Assets/Tests/InputSystem/Utilities/InlinedArrayTests.cs

@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using UnityEngine.InputSystem.Utilities;
+
+public class InlinedArrayTests
+{
+    [Test]
+    [Category("Utilities")]
+    [TestCase(1, 0)]
+    [TestCase(2, 0)]
+    [TestCase(3, 0)]
+    [TestCase(2, 1)]
+    [TestCase(3, 1)]
+    [TestCase(3, 2)]
+    [TestCase(10, 0)]
+    [TestCase(10, 5)]
+    [TestCase(10, 9)]
+    public void Utilities_InlinedArray_CanRemoveElementAtIndex(int count, int removeAt)
+    {
+        var comparisonList = new List<string>();
+        var array = new InlinedArray<string>();
+
+        for (var i = 0; i < count; ++i)
+        {
+            comparisonList.Add(i.ToString());
+            array.Append(i.ToString());
+        }
+
+        Assert.That(array.length, Is.EqualTo(comparisonList.Count));
+
+        array.RemoveAt(removeAt);
+        comparisonList.RemoveAt(removeAt);
+
+        Assert.That(array, Is.EquivalentTo(comparisonList));
+    }
+}

Assets/Tests/InputSystem/Utilities/InlinedArrayTests.cs.meta

@@ -11,6 +11,8 @@ however, it has to be formatted properly to pass verification tests.
 
 ### Fixed
 
+- Fixed wrong event handlers getting removed when having three or more handlers on an event (case 1196143).
+  * This was an bug in an internal data structure that impacted a number of code paths that were using the data structure.
 - Fixed `LayoutNotFoundException` being thrown when `InputControlPath.ToHumanReadableString` referenced a layout that could not be found.
 
 ## [1.0.0-preview.2] - 2019-11-4

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -4,6 +4,8 @@
 using UnityEngine.InputSystem.Utilities;
 using UnityEngine.Serialization;
 
+////TODO: add way to retrieve the currently ongoing interaction and also add way to know how long it's been going on
+
 ////FIXME: Whether a control from a binding that's part of a composite appears on an action is currently not consistently enforced.
 ////       If it mentions the action, it appears on the action. Otherwise it doesn't. The controls should consistently appear on the
 ////       action based on what action the *composite* references.
@@ -1091,6 +1093,8 @@ internal int BindingIndexOnActionToBindingIndexOnMap(int indexOfBindingOnAction)
                 $"Binding index {indexOfBindingOnAction} is out of range for action '{this}' with {currentBindingIndexOnAction + 1} bindings");
         }
 
+        ////TODO: make current event available in some form
+
         /// <summary>
         /// Information provided to action callbacks about what triggered an action.
         /// </summary>

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

@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 
+////TODO: API to get the control and device from the internal context
+
 ////TODO: ToString()
 
 namespace UnityEngine.InputSystem

Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/InputValue.cs

@@ -14,7 +14,7 @@ namespace Unity.XR.Oculus.Input
     public class OculusHMD : XRHMD
     {
         [Preserve]
-        [InputControl(noisy = true)]
+        [InputControl]
         [InputControl(name = "trackingState", layout = "Integer", aliases = new[] { "devicetrackingstate" })]
         [InputControl(name = "isTracked", layout = "Button", aliases = new[] { "deviceistracked" })]
         public ButtonControl userPresence { get; private set; }

Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/Oculus.cs

@@ -13,7 +13,7 @@ namespace UnityEngine.XR.WindowsMR.Input
     public class WMRHMD : XRHMD
     {
         [Preserve]
-        [InputControl(noisy = true)]
+        [InputControl]
         [InputControl(name = "devicePosition", layout = "Vector3", aliases = new[] { "HeadPosition" })]
         [InputControl(name = "deviceRotation", layout = "Quaternion", aliases = new[] { "HeadRotation" })]
         public ButtonControl userPresence { get; private set; }

Packages/com.unity.inputsystem/InputSystem/Plugins/XR/Devices/WindowsMR.cs

@@ -63,7 +63,7 @@ public TValue this[int index]
             get
             {
                 if (index < 0 || index >= length)
-                    throw new ArgumentOutOfRangeException("index");
+                    throw new ArgumentOutOfRangeException(nameof(index));
 
                 if (index == 0)
                     return firstValue;
@@ -73,7 +73,7 @@ public TValue this[int index]
             set
             {
                 if (index < 0 || index >= length)
-                    throw new ArgumentOutOfRangeException("index");
+                    throw new ArgumentOutOfRangeException(nameof(index));
 
                 if (index == 0)
                     firstValue = value;
@@ -278,7 +278,7 @@ public void RemoveAt(int index)
                 }
                 else
                 {
-                    firstValue = default(TValue);
+                    firstValue = default;
                 }
             }
             else
@@ -300,17 +300,19 @@ public void RemoveAt(int index)
                 {
                     // Remove entry at beginning or in middle by pasting together
                     // into a new array.
-                    var newAdditionalProcessors = new TValue[numAdditionalValues - 1];
+                    var newAdditionalValues = new TValue[numAdditionalValues - 1];
                     if (index >= 2)
                     {
                         // Copy elements before entry.
-                        Array.Copy(additionalValues, 0, newAdditionalProcessors, 0, index - 1);
+                        Array.Copy(additionalValues, 0, newAdditionalValues, 0, index - 1);
                     }
 
                     // Copy elements after entry. We already know that we're not removing
                     // the last entry so there have to be entries.
-                    Array.Copy(additionalValues, index + 1 - 1, newAdditionalProcessors, index - 1,
+                    Array.Copy(additionalValues, index + 1 - 1, newAdditionalValues, index - 1,
                         length - index - 1);
+
+                    additionalValues = newAdditionalValues;
                 }
             }