CHANGE: TrackedPoseDriver now uses InputActionProperty instead of direct InputActions (Unity-Technologies#1234).

Author: chris-massie

Assets/Tests/InputSystem/APIVerificationTests.cs

@@ -778,6 +778,10 @@ public InputEventBuffer(Unity.Collections.NativeArray<byte> buffer, int eventCou
         public void AppendEvent(UnityEngine.InputSystem.LowLevel.InputEvent* eventPtr, int capacityIncrementInBytes = 2048);
         public UnityEngine.InputSystem.LowLevel.InputEvent* AllocateEvent(int sizeInBytes, int capacityIncrementInBytes = 2048);
     ")]
+    // TrackedPose Driver changes
+    [Property("Exclusions", @"1.0.0
+         public class TrackedPoseDriver : UnityEngine.MonoBehaviour
+    ")]
     [ScopedExclusionProperty("1.0.0", "UnityEngine.InputSystem.Editor", "public sealed class InputControlPathEditor : System.IDisposable", "public void OnGUI(UnityEngine.Rect rect);")]
     public void API_MinorVersionsHaveNoBreakingChanges()
     {

Assets/Tests/InputSystem/Plugins/XRTests.cs

@@ -117,7 +117,7 @@ public void Layouts_XRGeneratedLayoutNames_OnlyContainAllowedCharacters()
         Assert.That(InputSystem.devices, Has.Count.EqualTo(1));
         var createdDevice = InputSystem.devices[0];
 
-        Assert.AreEqual(createdDevice.layout, "XRInputV1::Manufacturer::XRThisLayoutShouldhave1ValidName");
+        Assert.AreEqual(createdDevice.layout, "XRInputV1::__Manufacturer::XR_ThisLayoutShouldhave1ValidName");
     }
 
     [Test]
@@ -361,8 +361,8 @@ public void Components_CanUpdateGameObjectTransformThroughTrackedPoseDriver()
             var rotationAction = new InputAction();
             rotationAction.AddBinding("<TestHMD>/quaternion");
 
-            tpd.positionAction = positionAction;
-            tpd.rotationAction = rotationAction;
+            tpd.positionInput = new InputActionProperty(positionAction);
+            tpd.rotationInput = new InputActionProperty(rotationAction);
 
             // before render only
             var go1 = tpd.gameObject;
@@ -430,6 +430,71 @@ public void Components_CanUpdateGameObjectTransformThroughTrackedPoseDriver()
         }
     }
 
+    [Test]
+    [Category("Components")]
+    public void Components_TrackedPoseDriver_EnablesAndDisablesDirectActions()
+    {
+        var positionInput = new InputActionProperty(new InputAction(binding: "<TestHMD>/vector3"));
+        var rotationInput = new InputActionProperty(new InputAction(binding: "<TestHMD>/quaternion"));
+
+        var go = new GameObject();
+        var component = go.AddComponent<TrackedPoseDriver>();
+        component.enabled = false;
+        component.positionInput = positionInput;
+        component.rotationInput = rotationInput;
+
+        Assert.That(positionInput.action.enabled, Is.False);
+        Assert.That(rotationInput.action.enabled, Is.False);
+
+        component.enabled = true;
+
+        Assert.That(positionInput.action.enabled, Is.True);
+        Assert.That(rotationInput.action.enabled, Is.True);
+
+        component.enabled = false;
+
+        Assert.That(positionInput.action.enabled, Is.False);
+        Assert.That(rotationInput.action.enabled, Is.False);
+    }
+
+    [Test]
+    [Category("Components")]
+    public void Components_TrackedPoseDriver_DoesNotEnableOrDisableReferenceActions()
+    {
+        var map = new InputActionMap("map");
+        map.AddAction("Position", binding: "<TestHMD>/vector3");
+        map.AddAction("Rotation", binding: "<TestHMD>/quaternion");
+        var asset = ScriptableObject.CreateInstance<InputActionAsset>();
+        asset.AddActionMap(map);
+
+        var positionReference = ScriptableObject.CreateInstance<InputActionReference>();
+        var rotationReference = ScriptableObject.CreateInstance<InputActionReference>();
+        positionReference.Set(asset, "map", "Position");
+        rotationReference.Set(asset, "map", "Rotation");
+
+        var positionInput = new InputActionProperty(positionReference);
+        var rotationInput = new InputActionProperty(rotationReference);
+
+        var go = new GameObject();
+        var component = go.AddComponent<TrackedPoseDriver>();
+        component.enabled = false;
+        component.positionInput = positionInput;
+        component.rotationInput = rotationInput;
+
+        Assert.That(positionInput.action.enabled, Is.False);
+        Assert.That(rotationInput.action.enabled, Is.False);
+
+        component.enabled = true;
+
+        Assert.That(positionInput.action.enabled, Is.False);
+        Assert.That(rotationInput.action.enabled, Is.False);
+
+        component.enabled = false;
+
+        Assert.That(positionInput.action.enabled, Is.False);
+        Assert.That(rotationInput.action.enabled, Is.False);
+    }
+
     [Test]
     [Category("Layouts")]
     public void Layouts_PoseControlsCanBeCreatedBySubcontrols()

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -12,6 +12,8 @@ however, it has to be formatted properly to pass verification tests.
 
 ### Changed
 
+- Changed `TrackedPoseDriver` to use properties of type `InputActionProperty` rather than `InputAction` to allow more flexibility.
+- XRLayoutBuilder now supports `_` in sanitized names.
 - Added method `SetMotorSpeedsAndLightBarColor` as a workaround for setting both the light bar and motor speeds simultaneously on a DualShock 4 controller ([case 1271119](https://issuetracker.unity3d.com/issues/dualshock4-setlightbarcolor-and-setmotorspeeds-cannot-be-called-on-the-same-frame-using-input-system)).
 - Updated documentation for sensor WebGL support in 2021.2.
 

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

@@ -6,7 +6,7 @@
 namespace UnityEngine.InputSystem.LowLevel
 {
     /// <summary>
-    /// Enum of different player loop positions where the input system can invoke it's update mechanism.
+    /// Enum of different player loop positions where the input system can invoke its update mechanism.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1714:FlagsEnumsShouldHavePluralNames", Justification = "Not consistently used as flags, many using APIs expect only one type to be passed.")]
     [Flags]

Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputManager.cs

@@ -313,7 +313,7 @@ public void EnableJoining()
                     else
                     {
                         Debug.LogError(
-                            "No join action configured on PlayerInputManager but join behavior is set to JoinPlayersWhenActionIsTriggered",
+                            $"No join action configured on PlayerInputManager but join behavior is set to {nameof(PlayerJoinBehavior.JoinPlayersWhenJoinActionIsTriggered)}",
                             this);
                     }
                     break;