Merge branch 'develop' into stable

Author: jamesmcgill

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.4.2
+//     version 1.4.3
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Samples/SimpleDemo/SimpleControls.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.4.2
+//     version 1.4.3
 //     from Assets/Samples/SimpleDemo/SimpleControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Tests/InputSystem/Plugins/UserTests.cs

@@ -581,6 +581,23 @@ public void Users_CanUnpairDevicesAndRemoveUser()
         }));
     }
 
+    [Test]
+    [Category("Users")]
+    public void Users_CanUnpairDevice_WhenPairedToMultipleUsers()
+    {
+        var gamepad = InputSystem.AddDevice<Gamepad>();
+        var keyboard = InputSystem.AddDevice<Keyboard>();
+
+        InputUser.PerformPairingWithDevice(gamepad);
+        InputUser.PerformPairingWithDevice(keyboard);
+        var user = InputUser.PerformPairingWithDevice(gamepad);
+
+        user.UnpairDevicesAndRemoveUser();
+
+        Assert.That(InputUser.all[0].pairedDevices, Is.EquivalentTo(new[] {gamepad}));
+        Assert.That(InputUser.all[1].pairedDevices, Is.EquivalentTo(new[] {keyboard}));
+    }
+
     [Test]
     [Category("Users")]
     public void Users_CanQueryUnpairedDevices()

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -8,6 +8,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 Due to package verification, the latest version below is the unpublished version and the date is meaningless.
 however, it has to be formatted properly to pass verification tests.
 
+## [1.4.3] - 2022-09-23
+
+### Fixed
+- Added missing script and gizmo icon for `TrackedPoseDriver.cs` component ([case ISXB-262](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-262)).
+- Fix for mitigating symptoms reported in ([case UUM-10774](https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-10774) effectively avoiding reenabling mouse, pen or touch devices in `InputSystemPlugin.OnDestroy()` if currently quitting the editor. The fix avoids editor crashing if closed when Simulator Window is open. Note that the actual issue needs a separate fix in Unity and this package fix is only to avoid running into the issue.
+- Fixed an issue where Input Action name would not display correctly in Inspector if serialized as `[SerializedProperty]` within a class not derived from `MonoBehavior` ([case ISXB-124](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-124).
+- Fix an issue where users could end up with the wrong device assignments when using the InputUser API directly and removing a user ([case ISXB-274](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-231)).
+- Fixed an issue where PlayerInput behavior description was not updated when changing action assset ([case ISXB-286](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-286)).
+
+### Changed
+- Improved performance of HID descriptor parsing by moving json parsing to a simple custom predicitve parser instead of relying on Unity's json parsing. This should improve domain reload times when there are many HID devices connected to a machine.
+
 ## [1.4.2] - 2022-08-12
 
 ### Changed

Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs

@@ -15,7 +15,7 @@ public static partial class InputSystem
         // Keep this in sync with "Packages/com.unity.inputsystem/package.json".
         // NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include
         //       "-preview" suffixes here.
-        internal const string kAssemblyVersion = "1.4.2";
+        internal const string kAssemblyVersion = "1.4.3";
         internal const string kDocUrl = "https://docs.unity3d.com/Packages/com.unity.inputsystem@1.4";
     }
 }

Packages/com.unity.inputsystem/InputSystem/Devices/InputDeviceMatcher.cs

@@ -348,7 +348,7 @@ private static bool MatchSingleProperty(object pattern, string value)
         {
             // String match.
             if (pattern is string str)
-                return string.Compare(str, value, StringComparison.InvariantCultureIgnoreCase) == 0;
+                return string.Compare(str, value, StringComparison.OrdinalIgnoreCase) == 0;
 
             // Regex match.
             if (pattern is Regex regex)

Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
-//     version 1.4.2
+//     version 1.4.3
 //     from "Keyboard" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
-//     version 1.4.2
+//     version 1.4.3
 //     from "Mouse" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
-//     version 1.4.2
+//     version 1.4.3
 //     from "Touchscreen" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Packages/com.unity.inputsystem/InputSystem/Editor/DeviceSimulator/InputSystemPlugin.cs

@@ -12,6 +12,7 @@ internal class InputSystemPlugin : DeviceSimulatorPlugin
         internal Touchscreen SimulatorTouchscreen;
 
         private bool m_InputSystemEnabled;
+        private bool m_Quitting;
         private List<InputDevice> m_DisabledDevices;
 
         public override string title => "Input System";
@@ -21,6 +22,9 @@ public override void OnCreate()
             m_InputSystemEnabled = EditorPlayerSettingHelpers.newSystemBackendsEnabled;
             if (m_InputSystemEnabled)
             {
+                // Monitor whether the editor is quitting to avoid risking unsafe EnableDevice while quitting
+                UnityEditor.EditorApplication.quitting += OnQuitting;
+
                 m_DisabledDevices = new List<InputDevice>();
 
                 // deviceSimulator is never null when the plugin is instantiated by a simulator window, but it can be null during unit tests
@@ -95,15 +99,27 @@ public override void OnDestroy()
                     deviceSimulator.touchScreenInput -= OnTouchEvent;
                 InputSystem.onDeviceChange -= OnDeviceChange;
 
+                UnityEditor.EditorApplication.quitting -= OnQuitting;
+
                 if (SimulatorTouchscreen != null)
                     InputSystem.RemoveDevice(SimulatorTouchscreen);
                 foreach (var device in m_DisabledDevices)
                 {
-                    if (device.added)
+                    // Note that m_Quitting is used here to mitigate the problem reported in issue tracker:
+                    // https://issuetracker.unity3d.com/product/unity/issues/guid/UUM-10774.
+                    // Enabling a device will call into IOCTL of backend which will (may) be destroyed prior
+                    // to this callback on Unity version <= 2022.2. This is not a fix for the actual problem
+                    // of shutdown order but a package fix to mitigate this problem.
+                    if (device.added && !m_Quitting)
                         InputSystem.EnableDevice(device);
                 }
             }
         }
+
+        private void OnQuitting()
+        {
+            m_Quitting = true;
+        }
     }
 }