Merge branch 'develop' into throw-error-nda-inputsystem-without-plugin

Author: ritamerkl

Assets/Tests/InputSystem/Plugins/OnScreenTests.cs

@@ -395,7 +395,7 @@ public void Devices_DisablingLastOnScreenControlDoesReportActiveControl()
     // https://fogbugz.unity3d.com/f/cases/1271942
     [UnityTest]
     [Category("Devices")]
-    public IEnumerator Devices_CanHaveOnScreenJoystickControls()
+    public IEnumerator Devices_CanHaveOnScreenJoystickControls([Values(false, true)] bool useInIsolation)
     {
         foreach (var c in Camera.allCameras)
             Object.Destroy(c.gameObject);
@@ -422,18 +422,33 @@ public IEnumerator Devices_CanHaveOnScreenJoystickControls()
         canvasGO.AddComponent<GraphicRaycaster>();
         canvas.renderMode = RenderMode.ScreenSpaceOverlay;
 
-        var stickGO = new GameObject("Stick");
-        stickGO.SetActive(false);
-        var stickTransform = stickGO.AddComponent<RectTransform>();
-        var stick = stickGO.AddComponent<OnScreenStick>();
-        stickGO.AddComponent<Image>();
-        stickTransform.SetParent(canvasTransform);
-        stickTransform.anchorMin = new Vector2(0, 0);
-        stickTransform.anchorMax = new Vector2(0, 0);
-        stickTransform.anchoredPosition = new Vector2(100, 100);
-        stickTransform.sizeDelta = new Vector2(100, 100);
-        stick.controlPath = "<Gamepad>/leftStick";
-        stickGO.SetActive(true);
+        var stickLeftGO = new GameObject("StickLeft");
+        stickLeftGO.SetActive(false);
+        var stickLeftTransform = stickLeftGO.AddComponent<RectTransform>();
+        var stickLeft = stickLeftGO.AddComponent<OnScreenStick>();
+        stickLeft.useIsolatedInputActions = useInIsolation;
+        stickLeftGO.AddComponent<Image>();
+        stickLeftTransform.SetParent(canvasTransform);
+        stickLeftTransform.anchorMin = new Vector2(0, 0);
+        stickLeftTransform.anchorMax = new Vector2(0, 0);
+        stickLeftTransform.anchoredPosition = new Vector2(100, 100);
+        stickLeftTransform.sizeDelta = new Vector2(100, 100);
+        stickLeft.controlPath = "<Gamepad>/leftStick";
+        stickLeftGO.SetActive(true);
+
+        var stickRightGO = new GameObject("StickRight");
+        stickRightGO.SetActive(false);
+        var stickRightTransform = stickRightGO.AddComponent<RectTransform>();
+        var stickRight = stickRightGO.AddComponent<OnScreenStick>();
+        stickRight.useIsolatedInputActions = useInIsolation;
+        stickRightGO.AddComponent<Image>();
+        stickRightTransform.SetParent(canvasTransform);
+        stickRightTransform.anchorMin = new Vector2(0, 0);
+        stickRightTransform.anchorMax = new Vector2(0, 0);
+        stickRightTransform.anchoredPosition = new Vector2(500, 100);
+        stickRightTransform.sizeDelta = new Vector2(100, 100);
+        stickRight.controlPath = "<Gamepad>/rightStick";
+        stickRightGO.SetActive(true);
 
         var buttonGO = new GameObject("Button");
         buttonGO.SetActive(false);
@@ -464,7 +479,7 @@ public IEnumerator Devices_CanHaveOnScreenJoystickControls()
 
         Assert.That(player.devices, Is.EquivalentTo(new[] { Gamepad.all[0] }));
 
-        // Touch the stick and drag it upwards.
+        // Touch the Left stick and drag it upwards.
         BeginTouch(1, new Vector2(150, 150));
         yield return null;
         eventSystem.Update();
@@ -491,6 +506,38 @@ public IEnumerator Devices_CanHaveOnScreenJoystickControls()
         InputSystem.Update(); // Button is feeding events when responding to UI events.
 
         Assert.That(Gamepad.all[0].buttonSouth.isPressed, Is.False);
+
+        // Touch the right stick and drag it downwards
+        BeginTouch(2, new Vector2(550, 150));
+        yield return null;
+        eventSystem.Update();
+        Assert.That(eventSystem.IsPointerOverGameObject(), Is.True);
+        MoveTouch(2, new Vector2(550, 50));
+        yield return null;
+        eventSystem.Update();
+        InputSystem.Update(); // Stick is feeding events when responding to UI events.
+
+        Assert.That(Gamepad.all[0].leftStick.ReadValue(), Is.EqualTo(new Vector2(0, 1)).Using(Vector2EqualityComparer.Instance));
+        Assert.That(Gamepad.all[0].rightStick.ReadValue(), Is.EqualTo(new Vector2(0, -1)).Using(Vector2EqualityComparer.Instance));
+
+        // Release finger one and move second and ensure that it still works
+        EndTouch(1, new Vector2(550, 200));
+        MoveTouch(2, new Vector2(600, 150));
+        yield return null;
+        eventSystem.Update();
+        InputSystem.Update(); // Stick is feeding events when responding to UI events.
+
+        Assert.That(Gamepad.all[0].leftStick.ReadValue(), Is.EqualTo(new Vector2(0, 0)).Using(Vector2EqualityComparer.Instance));
+        Assert.That(Gamepad.all[0].rightStick.ReadValue(), Is.EqualTo(new Vector2(1, 0)).Using(Vector2EqualityComparer.Instance));
+
+        // Release finger two
+        EndTouch(2, new Vector2(600, 150));
+        yield return null;
+        eventSystem.Update();
+        InputSystem.Update(); // Stick is feeding events when responding to UI events.
+
+        Assert.That(Gamepad.all[0].leftStick.ReadValue(), Is.EqualTo(new Vector2(0, 0)).Using(Vector2EqualityComparer.Instance));
+        Assert.That(Gamepad.all[0].rightStick.ReadValue(), Is.EqualTo(new Vector2(0, 0)).Using(Vector2EqualityComparer.Instance));
     }
 
     [UnityTest]
@@ -519,6 +566,9 @@ public IEnumerator Devices_OnScreenStickDoesNotReceivePointerUpEventsInIsolatedM
             uiTestScene.uiInputModule.actionsAsset.actionMaps[0].LazyResolveBindings(true);
         };
 
+        // Ensure that the OnScreenStick component has been started
+        yield return null;
+
         yield return uiTestScene.PressAndDrag(image, new Vector2(50, 50));
 
         // The OnScreenStick when being driven from the UI (non-isolated mode) queues the events into the next

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -34,9 +34,13 @@ however, it has to be formatted properly to pass verification tests.
 - 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)
+- Fixed an editor crash caused by input debugger device state window reusing cached state when reconnecting Stadia controller. [ISXB-658](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-658)
 - Fixed an issue where batch jobs would fail with "Error: Error building Player because scripts are compiling" if a source generated .inputactions asset is out of sync with its generated source code (ISXB-1300).
+- Fixed multiple `OnScreenStick` Components that does not work together when using them simultaneously in isolation mode. [ISXB-813](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-813)
+- Fixed an issue in input actions editor window that caused certain fields in custom input composite bindings to require multiple clicks to action / focus. [ISXB-1171](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1171)
 
 ### Changed
+- Changed location of the link xml file (code stripping rules), from a temporary directory to the project Library folder (ISX-2140).
 - Added back the InputManager to InputSystem project-wide asset migration code with performance improvement (ISX-2086).
 - Changed `OnScreenControl` to automaticaly switch, in Single Player with autoswitch enabled, to the target device control scheme when the first component is enabled to prevent bad interactions when it start.
 - Changed paremeter `overrideModifiersNeedToBePressedFirst` to obsolete for `ButtonWithOneModifier`, `ButtonWithTwoModifiers`, `OneModifierComposite` and `TwoModifiersComposite` in favour the new `modifiersOrder` parameter which is more explicit.

Packages/com.unity.inputsystem/InputSystem/Editor/BuildPipeline/LinkFileGenerator.cs

@@ -77,9 +77,12 @@ public string GenerateAdditionalLinkXmlFile(BuildReport report, UnityLinkerBuild
 
             sb.AppendLine("</linker>");
 
-            var filePathName = Path.Combine(Application.dataPath, "..", "Temp", "InputSystemLink.xml");
-            File.WriteAllText(filePathName, sb.ToString());
-            return filePathName;
+            var linkXmlDirectory = Path.Combine(Application.dataPath, "..", "Library", "InputSystem");
+            var linkXmlFile = Path.Combine(linkXmlDirectory, $"{data.target}Link.xml");
+
+            Directory.CreateDirectory(linkXmlDirectory);
+            File.WriteAllText(linkXmlFile, sb.ToString());
+            return linkXmlFile;
         }
 
         static bool IsTypeUsedViaReflectionByInputSystem(Type type)

Packages/com.unity.inputsystem/InputSystem/Editor/Internal/InputStateWindow.cs

@@ -113,6 +113,26 @@ public unsafe void InitializeWithControl(InputControl control)
             PollBuffersFromControl(control, selectBuffer: true);
 
             titleContent = new GUIContent(control.displayName);
+
+            InputSystem.onDeviceChange += OnDeviceChange;
+        }
+
+        private void OnDeviceChange(InputDevice device, InputDeviceChange change)
+        {
+            if (m_Control is null)
+                return;
+
+            if (device.deviceId != m_Control.device.deviceId)
+                return;
+
+            if (change == InputDeviceChange.Removed)
+                Close();
+        }
+
+        internal void OnDestroy()
+        {
+            if (m_Control != null)
+                InputSystem.onDeviceChange -= OnDeviceChange;
         }
 
         private unsafe void PollBuffersFromControl(InputControl control, bool selectBuffer = false)
@@ -286,6 +306,12 @@ private string FormatByte(byte value)
         ////TODO: support dumping multiple state side-by-side when comparing
         private void DrawHexDump()
         {
+            if (m_StateBuffers is null)
+                return;
+
+            if (m_StateBuffers[m_SelectedStateBuffer] is null)
+                return;
+
             m_HexDumpScrollPosition = EditorGUILayout.BeginScrollView(m_HexDumpScrollPosition);
 
             var stateBuffer = m_StateBuffers[m_SelectedStateBuffer];

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs

@@ -176,7 +176,7 @@ private void OnFocusOut(FocusOutEvent @event = null)
             DelayFocusLost(element == null);
         }
 
-        private void OnStateChanged(InputActionsEditorState newState)
+        private void OnStateChanged(InputActionsEditorState newState, UIRebuildMode editorRebuildMode)
         {
 #if UNITY_INPUT_SYSTEM_INPUT_ACTIONS_EDITOR_AUTO_SAVE_ON_FOCUS_LOST
             // No action, auto-saved on edit-focus lost

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs

@@ -237,7 +237,7 @@ private void BuildUI()
             m_StateContainer.Initialize(rootVisualElement.Q("action-editor"));
         }
 
-        private void OnStateChanged(InputActionsEditorState newState)
+        private void OnStateChanged(InputActionsEditorState newState, UIRebuildMode editorRebuildMode)
         {
             DirtyInputActionsEditorWindow(newState);
             m_State = newState;

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/StateContainer.cs

@@ -7,9 +7,16 @@
 
 namespace UnityEngine.InputSystem.Editor
 {
+    // Enum used to dictate if a state change should rebuild the Input Actions editor UI
+    internal enum UIRebuildMode
+    {
+        None,
+        Rebuild,
+    }
+
     internal class StateContainer
     {
-        public event Action<InputActionsEditorState> StateChanged;
+        public event Action<InputActionsEditorState, UIRebuildMode> StateChanged;
 
         private VisualElement m_RootVisualElement;
         private InputActionsEditorState m_State;
@@ -21,7 +28,7 @@ public StateContainer(InputActionsEditorState initialState, string assetGUID)
             this.assetGUID = assetGUID;
         }
 
-        public void Dispatch(Command command)
+        public void Dispatch(Command command, UIRebuildMode editorRebuildMode = UIRebuildMode.Rebuild)
         {
             if (command == null)
                 throw new ArgumentNullException(nameof(command));
@@ -36,7 +43,7 @@ public void Dispatch(Command command)
                 // catch exceptions here or the UIToolkit scheduled event will keep firing forever.
                 try
                 {
-                    StateChanged?.Invoke(m_State);
+                    StateChanged?.Invoke(m_State, editorRebuildMode);
                 }
                 catch (Exception e)
                 {
@@ -55,9 +62,9 @@ public void Initialize(VisualElement rootVisualElement)
             m_RootVisualElement.Unbind();
             m_RootVisualElement.TrackSerializedObjectValue(m_State.serializedObject, so =>
             {
-                StateChanged?.Invoke(m_State);
+                StateChanged?.Invoke(m_State, UIRebuildMode.Rebuild);
             });
-            StateChanged?.Invoke(m_State);
+            StateChanged?.Invoke(m_State, UIRebuildMode.Rebuild);
             rootVisualElement.Bind(m_State.serializedObject);
         }
 

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositeBindingPropertiesView.cs

@@ -42,7 +42,7 @@ public override void RedrawUI(ViewState viewState)
 
             viewState.parameterListView.onChange = () =>
             {
-                Dispatch(Commands.UpdatePathNameAndValues(viewState.parameterListView.GetParameters(), viewState.selectedBindingPath));
+                Dispatch(Commands.UpdatePathNameAndValues(viewState.parameterListView.GetParameters(), viewState.selectedBindingPath), UIRebuildMode.None);
             };
             viewState.parameterListView.OnDrawVisualElements(rootElement);
         }

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ViewBase.cs

@@ -26,8 +26,12 @@ protected ViewBase(VisualElement root, StateContainer stateContainer)
             m_ChildViews = new List<IView>();
         }
 
-        protected void OnStateChanged(InputActionsEditorState state)
+        protected void OnStateChanged(InputActionsEditorState state, UIRebuildMode editorRebuildMode)
         {
+            // Return early if rebuilding the editor UI isn't required (ISXB-1171)
+            if (editorRebuildMode == UIRebuildMode.None)
+                return;
+
             UpdateView(state);
         }
 
@@ -70,9 +74,9 @@ public void DestroyChildView<TView>(TView view) where TView : IView
             view.DestroyView();
         }
 
-        public void Dispatch(Command command)
+        public void Dispatch(Command command, UIRebuildMode editorRebuildMode = UIRebuildMode.Rebuild)
         {
-            stateContainer.Dispatch(command);
+            stateContainer.Dispatch(command, editorRebuildMode);
         }
 
         public abstract void RedrawUI(TViewState viewState);