Merge Upstream/Develop

Author: StayTalm

Assets/Tests/InputSystem/CoreTests_Devices.cs

@@ -921,20 +921,25 @@ public void Devices_ChangingStateOfDevice_TriggersNotification()
         var gamepad = InputSystem.AddDevice<Gamepad>();
 
         var receivedCalls = 0;
-        InputDevice receivedDevice = null;
+        InputDevice receivedDevice = default;
+        InputEventPtr receivedEventPtr = default;
 
         InputState.onChange +=
-            d =>
+            (d, e) =>
         {
             ++receivedCalls;
             receivedDevice = d;
+            receivedEventPtr = e;
         };
 
         InputSystem.QueueStateEvent(gamepad, new GamepadState { leftStick = new Vector2(0.5f, 0.5f) });
         InputSystem.Update();
 
         Assert.That(receivedCalls, Is.EqualTo(1));
         Assert.That(receivedDevice, Is.SameAs(gamepad));
+        Assert.That(receivedEventPtr.valid, Is.True);
+        Assert.That(receivedEventPtr.deviceId, Is.EqualTo(gamepad.id));
+        Assert.That(receivedEventPtr.IsA<StateEvent>(), Is.True);
     }
 
     private class TestDeviceThatResetsStateInCallback : InputDevice, IInputStateCallbackReceiver
@@ -967,19 +972,22 @@ public void Devices_ChangingStateOfDevice_InStateCallback_TriggersNotification()
         var device = InputSystem.AddDevice<TestDeviceThatResetsStateInCallback>();
 
         var receivedCalls = 0;
-        InputDevice receivedDevice = null;
+        InputDevice receivedDevice = default;
+        InputEventPtr receivedEventPtr = default;
 
         InputState.onChange +=
-            d =>
+            (d, e) =>
         {
             ++receivedCalls;
             receivedDevice = d;
+            receivedEventPtr = e;
         };
 
         InputSystem.Update();
 
         Assert.That(receivedCalls, Is.EqualTo(1));
         Assert.That(receivedDevice, Is.SameAs(device));
+        Assert.That(receivedEventPtr.valid, Is.False);
     }
 
     [Test]

Assets/Tests/InputSystem/CoreTests_Layouts.cs

@@ -1059,6 +1059,24 @@ public void Layouts_RegisteringLayoutType_UsesBaseTypeAsBaseLayout()
         Assert.That(layout.baseLayouts, Is.EquivalentTo(new[] {new InternedString("Pointer")}));
     }
 
+    class DeviceWithControlProperties : InputDevice
+    {
+        public ButtonControl propertyWithoutAttribute { get; set; }
+        [InputControl]
+        public ButtonControl propertyWithAttribute { get; set; }
+    }
+
+    [Test]
+    [Category("Layouts")]
+    public void Layouts_RegisteringLayoutType_OnlyAddsPropertiesWithExplicitAttribute()
+    {
+        var device = InputSystem.AddDevice<DeviceWithControlProperties>();
+
+        Assert.That(device.TryGetChildControl("propertyWithoutAttribute"), Is.Null);
+        Assert.That(device.TryGetChildControl("propertyWithAttribute"), Is.Not.Null);
+        Assert.That(device.TryGetChildControl("propertyWithAttribute"), Is.TypeOf<ButtonControl>());
+    }
+
     // We consider layouts built by layout builders as being auto-generated. We want them to
     // be overridable by layouts built specifically for a device so we boost the score of
     // of type and JSON layouts such that they will override auto-generated layouts even if
@@ -1378,6 +1396,7 @@ public void Layouts_CanSpecifyMinAndMaxValuesForControlInJson()
 
     class BaseClassWithControl : InputDevice
     {
+        [InputControl]
         public AxisControl controlFromBase { get; set; }
     }
 

Assets/Tests/InputSystem/CoreTests_Remoting.cs

@@ -255,6 +255,12 @@ public void Send(Guid messageId, byte[] data)
             otherEnd.Receive(messageId, data);
         }
 
+        public bool TrySend(Guid messageId, byte[] data)
+        {
+            Send(messageId, data);
+            return true;
+        }
+
         private Dictionary<Guid, MessageEvent> m_MessageListeners = new Dictionary<Guid, MessageEvent>();
         private ConnectEvent m_ConnectionListeners = new ConnectEvent();
         private ConnectEvent m_DisconnectionListeners = new ConnectEvent();

Assets/Tests/InputSystem/Plugins/UserTests.cs

@@ -760,6 +760,23 @@ public void Users_CanFindUserPairedToSpecificDevice()
         Assert.That(InputUser.FindUserPairedToDevice(gamepad3), Is.Null);
     }
 
+    [Test]
+    [Category("Users")]
+    public void Users_CanDetectUseOfUnpairedDevice_FromControlThatDoesNotSupportMagnitude()
+    {
+        ++InputUser.listenForUnpairedDeviceActivity;
+
+        var receivedControls = new List<InputControl>();
+        InputUser.onUnpairedDeviceUsed +=
+            control => { receivedControls.Add(control); };
+
+        var mouse = InputSystem.AddDevice<Mouse>();
+
+        Set(mouse.delta, new Vector2(0, 0.234f));
+
+        Assert.That(receivedControls, Is.EquivalentTo(new[] { mouse.delta.y }));
+    }
+
     [Test]
     [Category("Users")]
     public void Users_CanDetectUseOfUnpairedDevice()

Assets/Tests/InputSystem/Plugins/XRTests.cs

@@ -364,7 +364,9 @@ public void Layouts_ButtonsArePackedByTheByte_WhileLargerStructuresAreFourByteAl
     [InputControlLayout(updateBeforeRender = true)]
     private class TestHMD : InputDevice
     {
+        [InputControl]
         public QuaternionControl quaternion { get; private set; }
+        [InputControl]
         public Vector3Control vector3 { get; private set; }
         protected override void FinishSetup()
         {

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -11,6 +11,11 @@ however, it has to be formatted properly to pass verification tests.
 
 ### Fixed
 
+- `XInputController` and `XboxOneGamepad` no longer have two extraneous, non-functional "menu" and "view" buttons.
+- Fixed `InputUser.onUnpairedDeviceUser` ignoring input on controls that do not support `EvaluateMagnitude`.
+  * This led to situations, for example, where `PlayerInput` would not initialize a control scheme switch from a `<Mouse>/delta` binding as the delta X and Y axes do not have min&max limits and thus return -1 from `EvaluateMagnitude`.
+- Fixed available processor list not updated right away when changing the action type in the Input Action editor window.
+
 #### Actions
 
 - `NullReferenceException` when the input debugger is open with actions being enabled.
@@ -20,6 +25,7 @@ however, it has to be formatted properly to pass verification tests.
 
 - Removed `timesliceEvents` setting - and made this tied to the update mode instead. We now always time slice when using fixed updates, and not when using dynamic updates.
 - When adding a composite, only ones compatible with the value type of the current action are shown. This will, for example, no longer display a `2D Vector` composite as an option on a floating-point button action.
+- The `InputState.onChange` callback now receives a second argument which is the event (if any) that triggered the state change on the device.
 
 ### Added
 

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

@@ -83,7 +83,7 @@ One of the most convenient ways to work with `.inputactions` assets in script is
 To enable this, tick the `Generate C# Class` in the importer properties in the inspector of the `.inputactions` asset when selected in Unity and hit "Apply".
 
     ////TODO: Update screenshot
-![MyPlayerControls Importer Settings](Images/MyPlayerControlsImporterSettings.png)
+![MyPlayerControls Importer Settings](Images/FireActionInputAssetInspector.png)
 
 This will generate a C# script that makes working with the asset a lot simpler. TODO
 

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

@@ -12,7 +12,6 @@
     * [Creating Actions in Code](#creating-actions-in-code)
 * [Using Actions](#using-actions)
     * [Responding to Actions](#responding-to-actions)
-    * [Continuous Actions](#continuous-actions)
     * [Pass-Through Actions](#pass-through-actions)
     * [Debugging Actions](#debugging-actions)
     * [Extending Actions](#extending-actions)
@@ -105,7 +104,7 @@ The editors work similar to the [action asset editor](ActionAssets.md).
 * To add or remote actions or bindings, click the plus or minus icon in the header.
 * To edit binding entries, double-click them.<br>
   ![InputBinding Inspector](Images/InputBindingInspector.png)
-* To edit action entries, double-click them.<br>
+* To edit action entries, double-click them in an InputActionMap, or click the 'gear' icon on individual action properties.<br>
   ![InputAction Inspector](Images/InputActionInspector.png)
 * Entries can also be right-clicked to bring up a context menu and can be dragged around (hold alt to duplicate).
 
@@ -339,20 +338,6 @@ trace.Dispose();
 
 Once recorded, a trace can be safely read from multiple threads as long as it is not concurrently being written to and as long as the action setup (i.e. the configuration data accessed by the trace) is not concurrently being changed on the main thread.
 
-### Continuous Actions
-
-By default, actions will trigger only in response to input events. This means that, for example, an action bound to the left stick of a gamepad will only trigger when the left stick is actually moved. This behavior can be undesirable when an input is meant to register for as long as a control is actuated -- regardless of whether it changes value in a particular frame or not.
-
-This is what "continuous" mode is for. It can be enabled in the UI by selecting the action in the [action editor](ActionAssets.md) and ticking the "Continuous" checkbox.
-
-    ////TODO: Update screenshot
-
-![Continuous Action](Images/ContinuousAction.png)
-
-When continuous mode is enabled, an action that goes into `Performed` phase will stay in the phase until it is `Cancelled`. Also, while in the `Performed` phase, an action in continuous mode will be `Performed` in a frame even if there is no input. The value returned by `ReadValue` will be the value of the control that was last used with the action.
-
->NOTE: Not all interactions support continuous mode. See [here](Interactions.md#predefined-interactions) for details.
-
 ### Pass-Through Actions
 
     ////TODO

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

@@ -100,7 +100,7 @@ You can listen to the following notifications:
 |--------|-----------|
 |[`Send Messages`](../api/UnityEngine.InputSystem.PlayerNotifications.html)|Uses [`GameObject.SendMessage`](https://docs.unity3d.com/ScriptReference/GameObject.SendMessage.html) on the `GameObject` that the [`PlayerInput`](../api/UnityEngine.InputSystem.PlayerInput.html) component belongs to. The messages that will be sent by the component are shown in the UI.|
 |[`Broadcast Messages`](../api/UnityEngine.InputSystem.PlayerNotifications.html)|Like `Send Message` but instead of [`GameObject.SendMessage`](https://docs.unity3d.com/ScriptReference/GameObject.SendMessage.html) uses [`GameObject.BroadcastMessage`](https://docs.unity3d.com/ScriptReference/GameObject.BroadcastMessage.html). This will broadcast the message down the `GameObject` hierarchy.|
-|[`Invoke Unity Events`](../api/UnityEngine.InputSystem.PlayerNotifications.html)|Uses a separate [`UnityEvent`](https://docs.unity3d.com/ScriptReference/Events.UnityEvent.html) for each individual type of message. When this is selected, the events that are available on the given [`PlayerInput`](../api/UnityEngine.InputSystem.PlayerInput.html) are accessible from the "Events" foldout. The argument received by events triggered for actions is the same as the one received by [`started`, `performed`, and `cancelled` callbacks](Actions.md#started-performed-and-cancelled-callbacks).<br><br>![PlayerInput UnityEvents](Images/PlayerInputUnityEvents.png)|
+|[`Invoke Unity Events`](../api/UnityEngine.InputSystem.PlayerNotifications.html)|Uses a separate [`UnityEvent`](https://docs.unity3d.com/ScriptReference/Events.UnityEvent.html) for each individual type of message. When this is selected, the events that are available on the given [`PlayerInput`](../api/UnityEngine.InputSystem.PlayerInput.html) are accessible from the "Events" foldout. The argument received by events triggered for actions is the same as the one received by [`started`, `performed`, and `cancelled` callbacks](Actions.md#started-performed-and-cancelled-callbacks).<br><br>![PlayerInput UnityEvents](Images/MyPlayerActionEvents.png)|
 |[`Invoke CSharp Events`](../api/UnityEngine.InputSystem.PlayerNotifications.html)|Similar to `Invoke Unity Events` except that the events are plain C# events available on the [`PlayerInput`](../api/UnityEngine.InputSystem.PlayerInput.html) API. These cannot be initialized from the inspector but have to be manually registered callbacks for in script.<br><br>The following events are available:<br><br><ul><li>[`onActionTriggered`](../api/UnityEngine.InputSystem.PlayerInput.html#UnityEngine_InputSystem_PlayerInput_onActionTriggered) (collective event for all actions on the player)</li><li>[`onDeviceLost`](../api/UnityEngine.InputSystem.PlayerInput.html#UnityEngine_InputSystem_PlayerInput_onDeviceLost)</li><li>[`onDeviceRegained`](../api/UnityEngine.InputSystem.PlayerInput.html#UnityEngine_InputSystem_PlayerInput_onDeviceRegained)</li></ul>|
 
 In addition to per-action notifications, the following general notifications are employed by [`PlayerInput`](../api/UnityEngine.InputSystem.PlayerInput.html).

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

@@ -1,17 +1,13 @@
-    ////WIP
-
 # Contributing
 
 [Full source code](https://github.com/Unity-Technologies/InputSystem) for the input system is available on GitHub. This is also where most of our development happens.
 
 >NOTE: This includes the full source code for the managed/C# part of the system. At this point, the native, platform-specific C++ backends are still closed-source and require a source code license.
 
-## Creating PRs
-
 ## Reporting Bugs
 
-## Feature Requests
+Input System bugs should be reported through using [same mechanism as for any other Unity bugs](https://unity3d.com/unity/qa/bug-reporting). Make sure to submit a repro project, and to mention that the bug is specific to the Input System package in the description, so it can get forwarded to the correct respondents at Unity.
 
 ## Discussion
 
-To ask questions or discuss the new input system, we have a [dedicated section on Unity's forum](https://forum.unity.com/forums/new-input-system.103/).
+To ask questions or discuss the input system, we have a [dedicated section on Unity's forum](https://forum.unity.com/forums/new-input-system.103/). This is also the best place to post feature requests.