Merge branch 'develop' into ekcoh/rebinding-issues-events

Author: ekcoh

Assets/Tests/InputSystem/Plugins/UITests.cs

@@ -2871,26 +2871,29 @@ public IEnumerator UI_CanOperateMultiplayerUILocallyUsingGamepads()
 
     [UnityTest]
     [Category("UI")]
-    public IEnumerator UI_CanDriveUIFromGamepad()
+
+    [TestCase("Gamepad", ExpectedResult = 1)]
+#if UNITY_WEBGL || UNITY_EDITOR
+    [TestCase("WebGLGamepad", ExpectedResult = 1)]
+#endif
+    public IEnumerator UI_CanDriveUIFromGamepad(string deviceLayout)
     {
-        var gamepad = InputSystem.AddDevice<Gamepad>();
+        var gamepad = (Gamepad)InputSystem.AddDevice(deviceLayout);
 
         var scene = CreateTestUI();
 
-        var asset = ScriptableObject.CreateInstance<InputActionAsset>();
-        var map = asset.AddActionMap("map");
-        var moveAction = map.AddAction("move", type: InputActionType.PassThrough, binding: "<Gamepad>/*stick");
-        var submitAction = map.AddAction("submit", type: InputActionType.PassThrough, binding: "<Gamepad>/buttonSouth");
-        var cancelAction = map.AddAction("cancel", type: InputActionType.PassThrough, binding: "<Gamepad>/buttonEast");
+        var actions = new DefaultInputActions();
 
-        scene.uiModule.move = InputActionReference.Create(moveAction);
-        scene.uiModule.submit = InputActionReference.Create(submitAction);
-        scene.uiModule.cancel = InputActionReference.Create(cancelAction);
+        scene.uiModule.move = InputActionReference.Create(actions.UI.Navigate);
+        scene.uiModule.submit = InputActionReference.Create(actions.UI.Submit);
+        scene.uiModule.cancel = InputActionReference.Create(actions.UI.Cancel);
 
         scene.uiModule.moveRepeatDelay = 0.1f;
         scene.uiModule.moveRepeatRate = 0.1f;
 
-        map.Enable();
+        actions.Enable();
+        Assert.That(actions.UI.enabled, Is.True);
+        Assert.That(actions.Player.enabled, Is.True);
 
         yield return null;
 
@@ -2913,7 +2916,7 @@ public IEnumerator UI_CanDriveUIFromGamepad()
                 OneEvent("type", EventType.Move),
                 OneEvent("device", gamepad),
                 OneEvent("moveDir", MoveDirection.Right),
-                OneEvent("moveVector", gamepad.leftStick.ReadValue())));
+                OneEvent("moveVector", new Vector2(1.0f, 0.0f))));
         Assert.That(scene.rightChildReceiver.events, Is.Empty);
 
 #if UNITY_INPUT_SYSTEM_INPUT_MODULE_NAVIGATION_DEVICE_TYPE
@@ -2932,7 +2935,7 @@ public IEnumerator UI_CanDriveUIFromGamepad()
                 OneEvent("type", EventType.Move),
                 OneEvent("device", gamepad),
                 OneEvent("moveDir", MoveDirection.Left),
-                OneEvent("moveVector", gamepad.leftStick.ReadValue())));
+                OneEvent("moveVector", new Vector2(-1.0f, 0.0f))));
         Assert.That(scene.rightChildReceiver.events, Is.Empty);
 
         scene.leftChildReceiver.events.Clear();
@@ -2946,7 +2949,7 @@ public IEnumerator UI_CanDriveUIFromGamepad()
                 OneEvent("type", EventType.Move),
                 OneEvent("device", gamepad),
                 OneEvent("moveDir", MoveDirection.Up),
-                OneEvent("moveVector", gamepad.leftStick.ReadValue())));
+                OneEvent("moveVector", new Vector2(0.0f, 1.0f))));
         Assert.That(scene.rightChildReceiver.events, Is.Empty);
 
         scene.leftChildReceiver.events.Clear();
@@ -2960,7 +2963,7 @@ public IEnumerator UI_CanDriveUIFromGamepad()
                 OneEvent("type", EventType.Move),
                 OneEvent("device", gamepad),
                 OneEvent("moveDir", MoveDirection.Down),
-                OneEvent("moveVector", gamepad.leftStick.ReadValue())));
+                OneEvent("moveVector", new Vector2(0.0f, -1.0f))));
         Assert.That(scene.rightChildReceiver.events, Is.Empty);
 
         scene.leftChildReceiver.events.Clear();
@@ -2975,7 +2978,7 @@ public IEnumerator UI_CanDriveUIFromGamepad()
                 OneEvent("type", EventType.Move),
                 OneEvent("device", gamepad),
                 OneEvent("moveDir", MoveDirection.Down),
-                OneEvent("moveVector", gamepad.leftStick.ReadValue())));
+                OneEvent("moveVector", new Vector2(0.0f, -1.0f))));
 
         scene.leftChildReceiver.events.Clear();
 
@@ -2989,7 +2992,7 @@ public IEnumerator UI_CanDriveUIFromGamepad()
                 OneEvent("type", EventType.Move),
                 OneEvent("device", gamepad),
                 OneEvent("moveDir", MoveDirection.Down),
-                OneEvent("moveVector", gamepad.leftStick.ReadValue())));
+                OneEvent("moveVector", new Vector2(0.0f, -1.0f))));
 
         scene.leftChildReceiver.events.Clear();
 
@@ -3031,6 +3034,10 @@ public IEnumerator UI_CanDriveUIFromGamepad()
 
         Assert.That(scene.leftChildReceiver.events, Is.Empty);
         Assert.That(scene.rightChildReceiver.events, Is.Empty);
+
+        actions.Disable();
+        Assert.That(actions.UI.enabled, Is.False);
+        Assert.That(actions.Player.enabled, Is.False);
     }
 
     [Test]

Assets/Tests/InputSystem/Plugins/WebGLTests.cs

@@ -43,9 +43,8 @@ public void Devices_SupportsWebGLStandardGamepads()
         Assert.That(gamepad.leftTrigger.ReadUnprocessedValue(), Is.EqualTo(0.123).Within(0.0001));
         Assert.That(gamepad.rightTrigger.ReadUnprocessedValue(), Is.EqualTo(0.234).Within(0.0001));
 
-        AssertStickValues(gamepad.leftStick, new Vector2(0.345f, -0.456f), -0.456f, 0, 0, 0.345f);
-        AssertStickValues(gamepad.rightStick, new Vector2(0.567f, -0.678f), -0.678f, 0, 0, 0.567f);
-
+        AssertStickValues(gamepad.leftStick, new Vector2(0.345f, -0.456f), 0, 0.456f, 0, 0.345f);
+        AssertStickValues(gamepad.rightStick, new Vector2(0.567f, -0.678f), 0, 0.678f, 0, 0.567f);
 
         InputSystem.QueueStateEvent(gamepad, new WebGLGamepadState
         {
@@ -54,9 +53,8 @@ public void Devices_SupportsWebGLStandardGamepads()
         });
         InputSystem.Update();
 
-        AssertStickValues(gamepad.leftStick, new Vector2(-0.345f, 0.456f), 0, -0.456f, 0.345f, 0);
-        AssertStickValues(gamepad.rightStick, new Vector2(-0.567f, 0.678f), 0, -0.678f, 0.567f, 0);
-
+        AssertStickValues(gamepad.leftStick, new Vector2(-0.345f, 0.456f), 0.456f, 0, 0.345f, 0);
+        AssertStickValues(gamepad.rightStick, new Vector2(-0.567f, 0.678f), 0.678f, 0, 0.567f, 0);
 
         // Test all buttons.
         AssertButtonPress(gamepad, new WebGLGamepadState().WithButton(GamepadButton.South), gamepad[GamepadButton.South]);

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -22,7 +22,9 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed Input Actions code generation overwriting user files when the names happened to match. [ISXB-1257](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1257)
 - Fixed Input Actions code generation using locale-dependent rules when lowercasing and uppercasing strings. [ISXB-1406]
 - Fixed an issue when providing JoinPlayer with a specific split screen index. [ISXB-897](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-897)
+- Fixed Inspector Window being refreshed all the time when a PlayerInput component is present with Invoke Unity Events nofication mode chosen [ISXB-1448](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1448)
 - Fixed an issue where an action with a name containing a slash "/" could not be found via `InputActionAsset.FindAction(string,bool)`. [ISXB-1306](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1306).
+- Fixed Gamepad stick up/down inputs that were not recognized in WebGL. [ISXB-1090](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1090)
 - Fixed an issue in `RebindingUISample` that fired actions bound to the same control as the target control in a rebinding process. ISXB-1524.
 
 ## [1.14.0] - 2025-03-20

Packages/com.unity.inputsystem/Documentation~/SupportedDevices.md

@@ -13,17 +13,16 @@ Support for the following Devices doesn't require specialized support of particu
 |------|-------|---|-----|---|-------|---|----|----|---|------|-----|
 |[Mouse](Mouse.md)|Yes|Yes|Yes|Yes|Yes|No|No|Yes|Yes|No|Yes|
 |[Keyboard](Keyboard.md)|Yes|Yes|Yes|Yes|Yes|No|No|Yes|Yes|No|Yes|
-|[Pen](Pen.md)|Yes|No (1)|No|Yes|Yes|Yes|No|No|No|No|No|
+|[Pen](Pen.md)|Yes|No |No|Yes|Yes|Yes|No|No|No|No|No|
 |[Touchscreen](Touch.md)|Yes|No|No|Yes|Yes|Yes|Yes(4)|No|No|No|Yes|
 |[Sensors](Sensors.md)|No|No|No|No|Yes|Yes|No|No|No|No|Yes(5)|
 |[Joystick](#other-gamepads-joysticks-and-racing-wheels) (2)|Yes|Yes|Yes|Yes|Yes|No|No|No|No|No|Yes|
 
 >__Notes__:
->1. Tablet support for macOS is coming in Unity 2020.1.
->2. Joysticks are supported as generic HIDs (See [Other gamepads, joysticks, and racing wheels](#other-gamepads-joysticks-and-racing-wheels) below).
->3. Consoles are supported using separate packages. You need to install these packages in your Project to enable console support.
->4. Indirect touches are received from Siri Remote.
->5. Sensor support for WebGL on Android and iOS devices is available in Unity 2021.2
+>1. Joysticks are supported as generic HIDs, refer to [Other gamepads, joysticks, and racing wheels](#other-gamepads-joysticks-and-racing-wheels) to learn more.
+>2. Consoles are supported using separate packages. You need to install these packages in your Project to enable console support.
+>3. Indirect touches are received from Siri Remote.
+>4. Sensor support for WebGL on Android and iOS devices is available in Unity 2021.2
 
 ## Gamepads
 
@@ -39,11 +38,10 @@ Support for the following Devices doesn't require specialized support of particu
 >__Notes__:
 >1. The trigger motors on the Xbox One controller are only supported on UWP and Xbox.
 >2. WebGL support varies between browsers, Devices, and operating systems.
->3. XInput controllers on Mac currently require the installation of the [Xbox Controller Driver for macOS](https://github.com/360Controller/360Controller). This driver only supports only USB connections, and doesn't support wireless dongles. However, the latest generation of Xbox One controllers natively support Bluetooth, and are natively supported on Macs as HIDs without any additional drivers when connected via Bluetooth.
+>3. XInput controllers on macOS currently require the installation of the [Xbox Controller Driver for macOS](https://github.com/360Controller/360Controller). This driver only supports only USB connections, and doesn't support wireless dongles. However, the latest generation of Xbox One controllers natively support Bluetooth, and are natively supported on Macs as HIDs without any additional drivers when connected via Bluetooth.
 >4. This includes any XInput-compatible Device.
->5. Unity doesn't support motor rumble and lightbar color over Bluetooth. Unity doesn't support the gyro or accelerometer on PS4/PS5 controllers on platforms other than the PlayStation consoles. Unity also doesn't support the DualShock 4 USB Wireless Adaptor.
-On UWP only USB connection is supported, motor rumble and lightbar are not working correctly.
->6. Unity supports Made for iOS (Mfi) certified controllers on iOS. Xbox One and PS4 controllers are only supported on iOS 13 or higher.
+>5. Unity doesn't support motor rumble and lightbar color over Bluetooth. Unity doesn't support the gyro or accelerometer on PS4/PS5 controllers on platforms other than the PlayStation consoles. Unity also doesn't support the DualShock 4 USB Wireless Adapter. On UWP, only USB connection is supported, motor rumble and lightbar are not working correctly.
+>6. Unity supports Made for iOS (MFi) certified controllers on iOS. Xbox One and PS4 controllers are only supported on iOS 13 or higher.
 >7. Consoles are supported using separate packages. You need to install these packages in your Project to enable console support.
 >8. Unity supports PS4 controllers on Android devices running [Android 10 or higher](https://playstation.com/en-us/support/hardware/ps4-pair-dualshock-4-wireless-with-sony-xperia-and-android).
 >9. Unity supports PS5 controllers on Android devices running [Android 12 or higher](https://playstation.com/en-gb/support/hardware/pair-dualsense-controller-bluetooth/).

Packages/com.unity.inputsystem/Documentation~/Workflow-Actions.md

@@ -22,7 +22,7 @@ Once you have created and assigned the default project-wide actions, the Actions
 
 The [Input Actions editor](ActionsEditor.html) provides a way to define and manage Actions which relate to what you want users to be able to do in your game or app. It also allows you to create bindings between your Actions and one or more types of control on various devices, such as a stick on a gamepad, a key on a keyboard, or a button on an XR controller.
 
-Actions and Bindings allows you to separate the conceptual actions that you want in your game or app from the the specific decvices and controls that a player has to use to perform the actions, which can make your code simpler and more flexible. This is in contrast to [directly reading device states](Workflow-Direct.html) in your code, which can suit simple projects, but can become unwieldy and inflexible for more complex projects.
+Actions and Bindings allows you to separate the conceptual actions that you want in your game or app from the specific devices and controls that a player has to use to perform the actions, which can make your code simpler and more flexible. This is in contrast to [directly reading device states](Workflow-Direct.html) in your code, which can suit simple projects, but can become unwieldy and inflexible for more complex projects.
 
 ### The default Actions
 
@@ -34,9 +34,9 @@ This means, in many cases, you can start scripting with the Input System without
 
 There are various ways to access your actions from code. One of the simplest ways is to use the `FindAction` method.
 
-`FindAction` allows you to search for an action by name from within the set of configured acations, and returns a reference which you can then either read the value directly (also called "polling"), or you can attach callback methods that are called the action is performed. The workflow described on this page focuses only on reading the action values. [You can read more about using callbacks here](RespondingToActions.html#action-callbacks).
+Use `FindAction` to search for an action by name from within the set of configured actions, and return a reference which you can then either read the value directly (also called "polling"), or you can attach callback methods that are called when the action is performed. The workflow described on this page focuses only on reading the action values. [You can read more about using callbacks here](RespondingToActions.html#action-callbacks).
 
-> __Tip__: Finding and storing a reference to an Action is similar to finding and storing a reference to a Component, so if you have done that elsewhere in Unity, this may be a familiar process.
+> __Tip__: Finding and storing a reference to an Action is similar to finding and storing a reference to a Component, so if you have done that elsewhere in Unity, this might be a familiar process.
 
 To use `FindAction` to get references to your Actions and read user input in your script, use the following steps:
 
@@ -55,12 +55,12 @@ To use `FindAction` to get references to your Actions and read user input in you
         moveAction = InputSystem.actions.FindAction("Move");
         jumpAction = InputSystem.actions.FindAction("Jump");
 
-1. In your Update() method, read the value from your action variables. This allows you to write code that reads the latest values coming from your Actions each frame and respond accordingly.<br/><br/>The way you read a value depends on the Action's **value type**. For example some actions may return a 1D or 2D axis value, and other actions may return a boolean true/false value. In this example, the "Move" action returns a 2D axis, and the "Jump" action returns a boolean.
+1. In your Update() method, read the value from your action variables. This allows you to write code that reads the latest values coming from your Actions each frame and respond accordingly.<br/><br/>The way you read a value depends on the Action's **value type**. For example some actions might return a 1D or 2D axis value, and other actions might return a Boolean true/false value. In this example, the **Move** action returns a 2D axis, and the **Jump** action returns a Boolean.
 
         Vector2 moveValue = moveAction.ReadValue<Vector2>();
         bool jumpValue = jumpAction.IsPressed();
 
-The example script below shows all these steps combined together into a single script:
+The following example script shows all these steps combined together into a single script:
 
 ```CSharp
 using UnityEngine;
@@ -95,14 +95,14 @@ public class Example : MonoBehaviour
 }
 ```
 
-> **Note:** You should avoid using `FindAction` in your Update() loop, because it performs a string-based lookup which could impact performance. This is why the Action refeferences in the example above are found during the Start() function, and stored in variables after finding them.
+> **Note:** You should avoid using `FindAction` in your `Update()` loop, because it performs a string-based lookup which could impact performance. This is why the Action references in the example above are found during the Start() function, and stored in variables after finding them.
 
-> **Note:** The [InputSystem.actions](../api/UnityEngine.InputSystem.InputSystem.html) API refers specifically to the Action Asset assigned as the [project-wide actions](ProjectWideActions.md). Most projects only require one Action Asset, but if you are using more than one Action Asset, you must create a reference using the type InputActionAsset to the asset you wish to access.
+> **Note:** The [InputSystem.actions](../api/UnityEngine.InputSystem.InputSystem.html) API refers specifically to the Action Asset assigned as the [project-wide actions](ProjectWideActions.md). Most projects only require one Action Asset, but if you are using more than one Action Asset, you must create a reference using the type InputActionAsset to the asset you want to access.
 
 ## Pros and Cons
 
 This is the recommended workflow with the Input System Package, providing a flexible but simple solution suitable for most projects.
 
-You benefit from the Action-based features such as Action Maps, Bindings, and the ability to configure them in the Actions Editor. You can also implement [user rebinding at run time](ActionBindings.html#interactive-rebinding).
+You benefit from the Action-based features such as Action Maps, Bindings, and the ability to configure them in the Actions Editor. You can also implement [user rebinding at runtime](ActionBindings.html#interactive-rebinding).
 
-This workflow alone doesn't provide built-in support for local multiplayer scenarios with multiple devices, so if you are producing a local multiplayer game you might want to consider using the [Actions & PlayerInput](./Workflow-PlayerInput.md) workflow.
+This workflow alone doesn't provide built-in support for local multiplayer scenarios with multiple devices, so if you are producing a local multiplayer game you might want to consider using the [Actions and PlayerInput](./Workflow-PlayerInput.md) workflow.