Update to use new feature

Author: keveleigh

org.mixedrealitytoolkit.input/Controllers/HandModel.cs

@@ -94,18 +94,18 @@ protected virtual void Start()
                 }
             }
 
-            MRTKInputFocusManager.XrSessionHasFocus.SubscribeAndUpdate(OnXrSessionFocus);
+            MRTKFocusFeature.XrSessionFocused.SubscribeAndUpdate(OnXrSessionFocus);
         }
 
         /// <summary>
         /// See <see cref="MonoBehaviour"/>.
         /// </summary>
-        private void OnDestroy() => MRTKInputFocusManager.XrSessionHasFocus.Unsubscribe(OnXrSessionFocus);
+        private void OnDestroy() => MRTKFocusFeature.XrSessionFocused.Unsubscribe(OnXrSessionFocus);
 
         /// <summary>
-        /// Sent to all GameObjects when the player gets or loses focus.
+        /// Sent when the XrSession gains or loses focus.
         /// </summary>
-        /// <param name="focus"><see langword="true"/> if the GameObjects have focus, else <see langword="false"/>.</param>
+        /// <param name="focus"><see langword="true"/> if the XrSession has focus, else <see langword="false"/>.</param>
         private void OnXrSessionFocus(bool focus)
         {
             // We want to ensure we're focused for input visualization, as some runtimes continue reporting "tracked" while pose updates are paused.

org.mixedrealitytoolkit.input/MRTK.Input.asmdef

@@ -5,7 +5,6 @@
         "glTFast",
         "Microsoft.MixedReality.OpenXR",
         "MixedReality.Toolkit.Core",
-        "Snapdragon.Spaces.Runtime",
         "Unity.InputSystem",
         "Unity.XR.CoreUtils",
         "Unity.XR.Hands",
@@ -70,11 +69,6 @@
             "name": "com.unity.xr.openxr",
             "expression": "",
             "define": "UNITY_OPENXR_PRESENT"
-        },
-        {
-            "name": "com.qualcomm.snapdragon.spaces",
-            "expression": "",
-            "define": "SNAPDRAGON_SPACES_PRESENT"
         }
     ],
     "noEngineReferences": false

org.mixedrealitytoolkit.input/Subsystems/Hands/HandsProvider.cs

@@ -61,7 +61,7 @@ public override bool TryGetEntireHand(XRNode handNode, out IReadOnlyList<HandJoi
         {
             Debug.Assert(handNode == XRNode.LeftHand || handNode == XRNode.RightHand, "Non-hand XRNode used in TryGetEntireHand query.");
 
-            if (!MRTKInputFocusManager.XrSessionHasFocus.Value)
+            if (!MRTKFocusFeature.XrSessionFocused.Value)
             {
                 jointPoses = Array.Empty<HandJointPose>();
                 return false;
@@ -75,7 +75,7 @@ public override bool TryGetJoint(TrackedHandJoint joint, XRNode handNode, out Ha
         {
             Debug.Assert(handNode == XRNode.LeftHand || handNode == XRNode.RightHand, "Non-hand XRNode used in TryGetJoint query.");
 
-            if (!MRTKInputFocusManager.XrSessionHasFocus.Value)
+            if (!MRTKFocusFeature.XrSessionFocused.Value)
             {
                 jointPose = default;
                 return false;

org.mixedrealitytoolkit.input/Utilities/MRTKInputFocusManager.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Mixed Reality Toolkit Contributors
 // Licensed under the BSD 3-Clause
 
-using System.Collections.Generic;
-using Unity.XR.CoreUtils.Bindings.Variables;
 using UnityEngine;
 using UnityEngine.InputSystem;
 
@@ -16,22 +14,26 @@ public sealed class MRTKInputFocusManager : MonoBehaviour
         [SerializeField, Tooltip("A set of input actions to enable/disable according to the app's focus state.")]
         private InputActionReference[] inputActionReferences;
 
-        /// <summary>
-        /// Whether the current XrSession has focus or not, stored as a bindable variable that can be subscribed to for value changes.
-        /// </summary>
-        /// <remarks>Always <see langword="true"/> in the editor.</remarks>
-        public static IReadOnlyBindableVariable<bool> XrSessionHasFocus => xrSessionHasFocus;
-        private static readonly BindableVariable<bool> xrSessionHasFocus = new(Application.isEditor);
+        private void OnEnable()
+        {
+            MRTKFocusFeature.XrSessionFocused.SubscribeAndUpdate(OnXrSessionFocus);
+        }
+
+        private void OnDisable()
+        {
+            MRTKFocusFeature.XrSessionFocused.Unsubscribe(OnXrSessionFocus);
+        }
 
         /// <summary>
-        /// We want to ensure we're focused for input, as some runtimes continue reporting "tracked" while pose updates are paused.
-        /// This is allowed, per-spec, as a "should": "Runtimes should make input actions inactive while the application is unfocused,
-        /// and applications should react to an inactive input action by skipping rendering of that action's input avatar
-        /// (depictions of hands or other tracked objects controlled by the user)."
+        /// Sent when the XrSession gains or loses focus.
         /// </summary>
-        private void OnFocusChange(bool focus)
+        /// <param name="focus"><see langword="true"/> if the XrSession has focus, else <see langword="false"/>.</param>
+        private void OnXrSessionFocus(bool focus)
         {
-            xrSessionHasFocus.Value = focus;
+            // We want to ensure we're focused for input visualization, as some runtimes continue reporting "tracked" while pose updates are paused.
+            // This is allowed, per-spec, as a "should": "Runtimes should make input actions inactive while the application is unfocused,
+            // and applications should react to an inactive input action by skipping rendering of that action's input avatar
+            // (depictions of hands or other tracked objects controlled by the user)."
 
             foreach (InputActionReference reference in inputActionReferences)
             {
@@ -45,59 +47,5 @@ private void OnFocusChange(bool focus)
                 }
             }
         }
-
-#if SNAPDRAGON_SPACES_PRESENT
-        private static readonly List<Qualcomm.Snapdragon.Spaces.SpacesOpenXRFeature> featureList = new();
-        private static int lastSessionState = -1;
-        private Qualcomm.Snapdragon.Spaces.SpacesOpenXRFeature spacesOpenXRFeature = null;
-
-        private void Update()
-        {
-            if (spacesOpenXRFeature == null)
-            {
-                int count = UnityEngine.XR.OpenXR.OpenXRSettings.Instance.GetFeatures(featureList);
-                for (int i = 0; i < count; i++)
-                {
-                    Qualcomm.Snapdragon.Spaces.SpacesOpenXRFeature feature = featureList[i];
-                    if (feature != null && feature.enabled)
-                    {
-                        spacesOpenXRFeature = feature;
-                        break;
-                    }
-                }
-            }
-
-            // XrSessionState maps better to this behavior than OnApplicationFocus but isn't
-            // easily available in Unity. For now, only the Snapdragon Spaces plugin provides it.
-            if (spacesOpenXRFeature != null && lastSessionState != spacesOpenXRFeature.SessionState)
-            {
-                // If we've lost focus...
-                // XR_SESSION_STATE_FOCUSED = 5
-                if (lastSessionState == 5)
-                {
-                    OnFocusChange(false);
-                }
-                // ...or if we've gained focus
-                // XR_SESSION_STATE_FOCUSED = 5
-                else if (spacesOpenXRFeature.SessionState == 5)
-                {
-                    OnFocusChange(true);
-                }
-
-                lastSessionState = spacesOpenXRFeature.SessionState;
-            }
-        }
-#elif !UNITY_EDITOR
-        /// <summary>
-        /// Sent to all GameObjects when the player gets or loses focus.
-        /// </summary>
-        /// <param name="focus"><see langword="true"/> if the GameObjects have focus, else <see langword="false"/>.</param>
-        /// <remarks>
-        /// Ideally, we'd use XrSessionState here, as it maps better to this behavior than OnApplicationFocus, but
-        /// it isn't easily available in Unity. For now, only the Snapdragon Spaces plugin provides it, and we use
-        /// OnApplicationFocus for the rest.
-        /// </remarks>
-        private void OnApplicationFocus(bool focus) => OnFocusChange(focus);
-#endif
     }
 }