Merge branch 'develop' into bugfix/XR-10725-initial-focus-desync

Author: chris-massie

Assets/Tests/InputSystem/CoreTests_Controls.cs

@@ -1428,7 +1428,7 @@ public void Controls_OptimizedControls_TrivialControlsAreOptimized()
         Assert.That(mouse.position.x.optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatFloat));
         Assert.That(mouse.position.y.optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatFloat));
         Assert.That(mouse.position.optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatVector2));
-        Assert.That(mouse.leftButton.optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatInvalid));
+        Assert.That(mouse.leftButton.optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatBit));
 
         InputSystem.settings.SetInternalFeatureFlag(InputFeatureNames.kUseOptimizedControls, false);
         Assert.That(mouse.position.x.optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatInvalid));

Assets/Tests/InputSystem/Plugins/XRTests.cs

@@ -1222,6 +1222,52 @@ public void Controls_OptimizedControls_PoseControl_IsOptimized()
         Assert.That((device["posecontrol"] as PoseControl).optimizedControlDataType, Is.EqualTo(InputStateBlock.FormatPose));
     }
 
+    [Test]
+    [Category("Controls")]
+    [TestCase(true)]
+    [TestCase(false)]
+    public void Controls_PoseControl_IsTracked_ReadsCorrectly(bool useOptimizedControls)
+    {
+        InputSystem.settings.SetInternalFeatureFlag(InputFeatureNames.kUseOptimizedControls, useOptimizedControls);
+
+        runtime.ReportNewInputDevice(PoseDeviceState.CreateDeviceDescription().ToJson());
+
+        InputSystem.Update();
+
+        var device = InputSystem.devices[0];
+        var poseControl = device["posecontrol"] as PoseControl;
+
+        // Queue state with isTracked = true (byte value 1)
+        InputSystem.QueueStateEvent(device, new PoseDeviceState
+        {
+            isTracked = 1,
+            trackingState = (uint)(InputTrackingState.Position | InputTrackingState.Rotation),
+            position = new Vector3(1, 2, 3),
+            rotation = Quaternion.identity,
+        });
+        InputSystem.Update();
+
+        // Reading isTracked as a ButtonControl should return true
+        Assert.That(poseControl.isTracked.isPressed, Is.True, "isTracked.isPressed should be true when tracked");
+        Assert.That(poseControl.isTracked.ReadValue(), Is.EqualTo(1.0f).Within(0.001f), "isTracked.ReadValue() should be 1.0f when tracked");
+
+        // Reading the full PoseState should also have isTracked = true
+        var poseState = poseControl.ReadValue();
+        Assert.That(poseState.isTracked, Is.True, "PoseState.isTracked should be true when tracked");
+
+        // Queue state with isTracked = false (byte value 0)
+        InputSystem.QueueStateEvent(device, new PoseDeviceState
+        {
+            isTracked = 0,
+            trackingState = 0,
+        });
+        InputSystem.Update();
+
+        Assert.That(poseControl.isTracked.isPressed, Is.False, "isTracked.isPressed should be false when not tracked");
+        Assert.That(poseControl.isTracked.ReadValue(), Is.EqualTo(0.0f).Within(0.001f), "isTracked.ReadValue() should be 0.0f when not tracked");
+        Assert.That(poseControl.ReadValue().isTracked, Is.False, "PoseState.isTracked should be false when not tracked");
+    }
+
     // ISXB-405
     [Test]
     [Category("Devices")]

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed `IndexOutOfRangeException` in `InputDeviceBuilder` when connecting an HID gamepad whose report descriptor declares a hat switch with Report Size 8 (e.g. ESP32-BLE-Gamepad). The HID layer now anchors the hat's directional sub-controls to the hat's own byte instead of letting the layout system auto-allocate a fresh byte for each [UUM-143659](https://jira.unity3d.com/browse/UUM-143659).
 - Fixed `OnMouseUpAsButton` and `OnMouseUp` being dropped in Play mode when the Game view's focus changes between a press and its release on Unity 6000.5.0a8 and newer. The legacy `SendMouseEvents` pipeline is no longer driven from `InputUpdateType.Editor` updates, which read the editor state buffer (position (0,0), not pressed) and produced a spurious mouse release that cleared the press target.
 - Fixed Input Debugger window's incorrect name. It is now called 'Input Debugger' instead of 'Input Debug' [UUM-137124](https://jira.unity3d.com/browse/UUM-137124).
+- Fixed `PoseControl.isTracked` always returning false when read through non-optimized code paths (e.g. Input Debugger) due to `sizeInBits = 8` causing the value to be normalized as `1/255` instead of `1.0`.
 
 ### Changed
 - Action-level `IsPressed`, `WasPressedThisFrame`, and `WasReleasedThisFrame` for bindings to `Vector2Control` / `StickControl` no longer consult a per-control `pressPoint` on the vector (that field was removed). Use a `Press` interaction to set a custom threshold, or rely on `defaultButtonPressPoint`.

Packages/com.unity.inputsystem/Documentation~/create-precompiled-layout.md

@@ -90,5 +90,3 @@ namepace MyNamespace
     {
         //...
 ```
-
-The namespace of the generated layout will correspond to the

Packages/com.unity.inputsystem/InputSystem/Runtime/Controls/AxisControl.cs

@@ -310,6 +310,7 @@ private float EvaluateMagnitude(float value)
             return NormalizeProcessor.Normalize(clampedValue, min, max, 0);
         }
 
+        /// <inheritdoc />
         protected override FourCC CalculateOptimizedControlDataType()
         {
             var noProcessingNeeded =

Packages/com.unity.inputsystem/InputSystem/Runtime/Controls/ButtonControl.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using UnityEngine.InputSystem.LowLevel;
+using UnityEngine.InputSystem.Utilities;
 using UnityEngine.Scripting;
 
 ////REVIEW: introduce separate base class for ButtonControl and AxisControl instead of deriving ButtonControl from AxisControl?
@@ -378,6 +379,21 @@ internal void UpdateWasPressedEditor()
 
 #endif // UNITY_EDITOR
 
+        /// <inheritdoc />
+        protected override FourCC CalculateOptimizedControlDataType()
+        {
+            if (clamp == Clamp.None &&
+                invert == false &&
+                normalize == false &&
+                scale == false &&
+                m_StateBlock.format == InputStateBlock.FormatBit &&
+                m_StateBlock.sizeInBits == 1 &&
+                m_StateBlock.bitOffset == 0)
+                return InputStateBlock.FormatBit;
+
+            return base.CalculateOptimizedControlDataType();
+        }
+
         // We make the current global default button press point available as a static so that we don't have to
         // constantly make the hop from InputSystem.settings -> InputManager.m_Settings -> defaultButtonPressPoint.
         internal static float s_GlobalDefaultButtonPressPoint;

Packages/com.unity.inputsystem/InputSystem/Runtime/Plugins/XR/Controls/PoseControl.cs

@@ -60,7 +60,7 @@ public PoseState(bool isTracked, TrackingState trackingState, Vector3 position,
         /// <remarks>
         /// Fully tracked means that the pose is accurate and not using any simulated or extrapolated positions, and the system tracking this pose is able to confidently track this object.
         /// </remarks>
-        [FieldOffset(0), InputControl(displayName = "Is Tracked", layout = "Button", sizeInBits = 8 /* needed to ensure optimization kicks-in */)]
+        [FieldOffset(0), InputControl(displayName = "Is Tracked", layout = "Button", sizeInBits = 1)]
         public bool isTracked;
 
         /// <summary>
@@ -252,7 +252,7 @@ protected override FourCC CalculateOptimizedControlDataType()
             if (
                 m_StateBlock.sizeInBits == PoseState.kSizeInBytes * 8 &&
                 m_StateBlock.bitOffset == 0 &&
-                isTracked.optimizedControlDataType == InputStateBlock.kFormatByte &&
+                isTracked.optimizedControlDataType == InputStateBlock.kFormatBit &&
                 trackingState.optimizedControlDataType == InputStateBlock.kFormatInt &&
                 position.optimizedControlDataType == InputStateBlock.kFormatVector3 &&
                 rotation.optimizedControlDataType == InputStateBlock.kFormatQuaternion &&