Merge branch 'develop' into isxb-1278-fix-action-properties-editor-ui

Author: bmalrat

Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs

@@ -58,6 +58,7 @@ IEnumerator WaitForActionMapRename(int index, bool isActive, double timeoutSecs
     #endregion
 
     [Test]
+    [Ignore("Instability, see ISXB-1284")]
     public void CanListActionMaps()
     {
         var actionMapsContainer = m_Window.rootVisualElement.Q("action-maps-container");
@@ -71,6 +72,7 @@ public void CanListActionMaps()
     }
 
     [UnityTest]
+    [Ignore("Instability, see ISXB-1284")]
     public IEnumerator CanCreateActionMap()
     {
         var button = m_Window.rootVisualElement.Q<Button>("add-new-action-map-button");
@@ -99,6 +101,7 @@ public IEnumerator CanCreateActionMap()
     }
 
     [UnityTest]
+    [Ignore("Instability, see ISXB-1284")]
     public IEnumerator CanRenameActionMap()
     {
         var actionMapsContainer = m_Window.rootVisualElement.Q("action-maps-container");
@@ -147,6 +150,7 @@ public IEnumerator CanRenameActionMap()
     }
 
     [UnityTest]
+    [Ignore("Instability, see ISXB-1284")]
     public IEnumerator CanDeleteActionMap()
     {
         var actionMapsContainer = m_Window.rootVisualElement.Q("action-maps-container");

Assets/Tests/InputSystem/Plugins/PlayerInputTests.cs

@@ -2405,6 +2405,39 @@ public void PlayerInput_CanDisableAfterAssigningAction_WithControlSchemesAndInte
         player.SetActive(false); // Should cause full rebinding and not assert
     }
 
+    [Test]
+    [Category("PlayerInput")]
+    public void PlayerInput_DelegatesAreUpdate_WhenActionMapAddedAfterAssignment()
+    {
+        var gamepad = InputSystem.AddDevice<Gamepad>();
+
+        var go = new GameObject();
+        var listener = go.AddComponent<MessageListener>();
+        var playerInput = go.AddComponent<PlayerInput>();
+        playerInput.defaultActionMap = "Other";
+        var actionAsset = InputActionAsset.FromJson(kActions);
+        playerInput.actions = actionAsset;
+
+        // Disable the asset while adding another action map to it as none
+        // of the actions in the asset can be enabled during modification
+        //
+        actionAsset.Disable();
+        var keyboard = InputSystem.AddDevice<Keyboard>();
+        var newActionMap = actionAsset.AddActionMap("NewMap");
+        var newAction = newActionMap.AddAction("NewAction");
+        newAction.AddBinding("<Keyboard>/k", groups: "Keyboard");
+        actionAsset.AddControlScheme("Keyboard").WithRequiredDevice<Keyboard>();
+        actionAsset.Enable();
+
+        playerInput.currentActionMap = newActionMap;
+        playerInput.ActivateInput();
+        listener.messages.Clear();
+
+        Press(keyboard.kKey);
+
+        Assert.That(listener.messages, Has.Exactly(1).With.Property("name").EqualTo("OnNewAction"));
+    }
+
     private struct Message : IEquatable<Message>
     {
         public string name { get; set; }
@@ -2477,6 +2510,11 @@ public void OnOtherAction(InputValue value)
             messages?.Add(new Message { name = "OnOtherAction", value = value.Get<float>() });
         }
 
+        public void OnNewAction(InputValue value)
+        {
+            messages?.Add(new Message { name = "OnNewAction", value = value.Get<float>() });
+        }
+
         // ReSharper disable once UnusedMember.Local
         public void OnActionWithSpaces(InputValue value)
         {

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -32,6 +32,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed an issue in `Samples/Visualizers/GamepadVisualizer.unity` sample where the visualization wouldn't handle device disconnects or current device changes properly (ISXB-1243).
 - Fixed an issue when displaying Serialized InputAction's Processor properties inside the Inspector window. [ISXB-1269](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1269)
 - Fixed an issue with default device selection when adding new Control Scheme.
+- Fixed an issue where action map delegates were not updated when the asset already assigned to the PlayerInput component were changed [ISXB-711](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-711).
 - Fixed Action properties edition in the UI Toolkit version of the Input Actions Asset editor. [ISXB-1277](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1277)
 
 ### Changed

Packages/com.unity.inputsystem/DocCodeSamples.Tests/DocCodeSamples.asmdef

@@ -4,7 +4,9 @@
     "references": [
         "GUID:75469ad4d38634e559750d17036d5f7c"
     ],
-    "includePlatforms": [],
+    "includePlatforms": [
+        "Editor"
+    ],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": true,

Packages/com.unity.inputsystem/DocCodeSamples.Tests/InputSystemUIInputModuleAssignActionsExample.cs

@@ -0,0 +1,42 @@
+#if UNITY_INPUT_SYSTEM_ENABLE_UI
+
+using UnityEngine;
+using UnityEngine.InputSystem.UI;
+
+namespace DocCodeSamples.Tests
+{
+    internal class InputSystemUIInputModuleAssignActionsExample : MonoBehaviour
+    {
+        // Reference to the InputSystemUIInputModule component, needs to be provided in the Inspector
+        public InputSystemUIInputModule uiModule;
+
+        void Start()
+        {
+            // Assign default actions
+            AssignActions();
+        }
+
+        void AssignActions()
+        {
+            if (uiModule != null)
+                uiModule.AssignDefaultActions();
+            else
+                Debug.LogError("InputSystemUIInputModule not found.");
+        }
+
+        void UnassignActions()
+        {
+            if (uiModule != null)
+                uiModule.UnassignActions();
+            else
+                Debug.LogError("InputSystemUIInputModule not found.");
+        }
+
+        void OnDestroy()
+        {
+            // Unassign actions when the object is destroyed
+            UnassignActions();
+        }
+    }
+}
+#endif

Packages/com.unity.inputsystem/DocCodeSamples.Tests/InputSystemUIInputModuleAssignActionsExample.cs.meta

@@ -34,7 +34,6 @@ public class ButtonControl : AxisControl
         /// <summary>
         /// The minimum value the button has to reach for it to be considered pressed.
         /// </summary>
-        /// <value>Button press threshold.</value>
         /// <remarks>
         /// The button is considered pressed, if it has a value equal to or greater than
         /// this value.
@@ -64,7 +63,6 @@ public class ButtonControl : AxisControl
         /// <summary>
         /// Return <see cref="pressPoint"/> if set, otherwise return <see cref="InputSettings.defaultButtonPressPoint"/>.
         /// </summary>
-        /// <value>Effective value to use for press point thresholds.</value>
         public float pressPointOrDefault => pressPoint > 0 ? pressPoint : s_GlobalDefaultButtonPressPoint;
 
         /// <summary>
@@ -106,7 +104,7 @@ public ButtonControl()
         /// <remarks>
         /// The default format for the control is <see cref="InputStateBlock.FormatBit"/>.
         /// The control's minimum value is set to 0 and the maximum value to 1.
-        /// See <see cref="InputSettings.defaultButtonPressPoint"/> for the default press point.
+        /// See <see cref="InputSettings.defaultButtonPressPoint"/> and <see cref="pressPoint"/>for the (default) press point.
         /// </remarks>
         /// <example>
         /// <code>
@@ -143,10 +141,9 @@ public ButtonControl()
         /// <summary>
         /// Whether the button is currently pressed.
         /// </summary>
-        /// <value>True if button is currently pressed.</value>
         /// <remarks>
         /// A button is considered pressed if its value is equal to or greater
-        /// than its button press threshold (<see cref="pressPointOrDefault"/>).
+        /// than its button press threshold (<see cref="pressPointOrDefault"/>, <see cref="pressPoint"/>).
         /// </remarks>
         /// <example>
         /// <para>You can use this to read whether specific keys are currently pressed by using isPressed on keys, as shown in the following examples:</para>
@@ -242,7 +239,6 @@ private void BeginTestingForFramePresses(bool currentlyPressed, bool pressedLast
         /// <summary>
         /// Whether the press started this frame.
         /// </summary>
-        /// <value>True if the current press of the button started this frame.</value>
         /// <remarks>
         /// The first time this function - or wasReleasedThisFrame - are called, it's possible that extremely fast
         /// inputs (or very slow frame update times) will result in presses/releases being missed.
@@ -304,12 +300,12 @@ public bool wasPressedThisFrame
         /// <summary>
         /// Whether the press ended this frame.
         /// </summary>
-        /// <value>True if the current press of the button ended this frame.</value>
         /// <remarks>
         /// _Note_: The Input System identifies keys by physical layout, not according to the current language mapping of the keyboard. To query the name of the key according to the language mapping, use <see cref="InputControl.displayName"/>.
         /// </remarks>
         /// <example>
         /// <para>An example showing the use of this property on a gamepad button and a keyboard key:</para>
+        ///
         /// <code>
         /// using UnityEngine;
         /// using UnityEngine.InputSystem;