Update rigged hand mesh flicker bug fix to not be a breaking interfac…

…e change (#10831) * Add some guards * Remove breaking change
microsoft · Aug 5, 2022 · f1f8b05 · f1f8b05
1 parent 1d18e27
commit f1f8b05
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 27 deletions.
diff --git a/Assets/MRTK/Core/Interfaces/Devices/IMixedRealityHand.cs b/Assets/MRTK/Core/Interfaces/Devices/IMixedRealityHand.cs
@@ -10,11 +10,6 @@ namespace Microsoft.MixedReality.Toolkit.Input
     /// </summary>
     public interface IMixedRealityHand : IMixedRealityController
     {
-        /// <summary>
-        /// Has the hand any joint data available.
-        /// </summary>
-        bool IsJointDataAvailable { get; }
-
         /// <summary>
         /// Get the current pose of a hand joint.
         /// </summary>
@@ -24,4 +19,4 @@ public interface IMixedRealityHand : IMixedRealityController
         /// </remarks>
         bool TryGetJoint(TrackedHandJoint joint, out MixedRealityPose pose);
     }
-}
+}
diff --git a/Assets/MRTK/Core/Providers/Hands/BaseHand.cs b/Assets/MRTK/Core/Providers/Hands/BaseHand.cs
@@ -78,9 +78,6 @@ protected void UpdateVelocity()
 
         #endregion Gesture Definitions
 
-        /// <inheritdoc />
-        public abstract bool IsJointDataAvailable { get; }
-
         /// <inheritdoc />
         public abstract bool TryGetJoint(TrackedHandJoint joint, out MixedRealityPose pose);
 
@@ -126,4 +123,4 @@ private float DistanceSqrPointToLine(Vector3 lineStart, Vector3 lineEnd, Vector3
 
         #endregion Private InputSource Helpers
     }
-}
+}
diff --git a/Assets/MRTK/Core/Providers/InputSimulation/SimulatedHand.cs b/Assets/MRTK/Core/Providers/InputSimulation/SimulatedHand.cs
@@ -100,9 +100,6 @@ protected SimulatedHand(
             : base(trackingState, controllerHandedness, inputSource, interactions, definition)
         { }
 
-        /// <inheritdoc/>
-        public override bool IsJointDataAvailable => jointPoses.Count > 0;
-
         /// <inheritdoc />
         public override bool TryGetJoint(TrackedHandJoint joint, out MixedRealityPose pose) => jointPoses.TryGetValue(joint, out pose);
 
@@ -126,4 +123,4 @@ public void UpdateState(SimulatedHandData handData)
         /// <param name="handData">hand data provided by the simulation</param>
         protected abstract void UpdateInteractions(SimulatedHandData handData);
     }
-}
+}
diff --git a/Assets/MRTK/Providers/LeapMotion/LeapMotionArticulatedHand.cs b/Assets/MRTK/Providers/LeapMotion/LeapMotionArticulatedHand.cs
@@ -44,9 +44,6 @@ public LeapMotionArticulatedHand(
 
         #region IMixedRealityHand Implementation
 
-        /// <inheritdoc />
-        public override bool IsJointDataAvailable => jointPoses.Count > 0;
-
         /// <inheritdoc/>
         public override bool TryGetJoint(TrackedHandJoint joint, out MixedRealityPose pose) => jointPoses.TryGetValue(joint, out pose);
 

diff --git a/Assets/MRTK/Providers/Oculus/XRSDK/MRTK-Quest/Scripts/Input/Controllers/OculusHand.cs b/Assets/MRTK/Providers/Oculus/XRSDK/MRTK-Quest/Scripts/Input/Controllers/OculusHand.cs
@@ -83,9 +83,6 @@ public override void SetupDefaultInteractions()
 
         protected readonly Dictionary<TrackedHandJoint, MixedRealityPose> jointPoses = new Dictionary<TrackedHandJoint, MixedRealityPose>();
 
-        /// <inheritdoc/>
-        public override bool IsJointDataAvailable => jointPoses.Count > 0;
-
         /// <inheritdoc/>
         public override bool TryGetJoint(TrackedHandJoint joint, out MixedRealityPose pose)
         {

diff --git a/Assets/MRTK/Providers/OpenXR/Scripts/MicrosoftArticulatedHand.cs b/Assets/MRTK/Providers/OpenXR/Scripts/MicrosoftArticulatedHand.cs
@@ -50,9 +50,6 @@ public MicrosoftArticulatedHand(TrackingState trackingState, Handedness controll
 
         #region IMixedRealityHand Implementation
 
-        /// <inheritdoc/>
-        public bool IsJointDataAvailable => unityJointPoses != null;
-
         /// <inheritdoc/>
         public bool TryGetJoint(TrackedHandJoint joint, out MixedRealityPose pose)
         {

diff --git a/...TK/Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityArticulatedHand.cs b/...TK/Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityArticulatedHand.cs
@@ -48,16 +48,21 @@ public WindowsMixedRealityArticulatedHand(
             handMeshProvider = (controllerHandedness == Handedness.Left) ? WindowsMixedRealityHandMeshProvider.Left : WindowsMixedRealityHandMeshProvider.Right;
             handMeshProvider.SetInputSource(inputSource);
 
+#if WINDOWS_UWP || DOTNETWINRT_PRESENT
             articulatedHandApiAvailable = WindowsApiChecker.IsMethodAvailable(
                 "Windows.UI.Input.Spatial",
                 "SpatialInteractionSourceState",
                 "TryGetHandPose");
+#endif // WINDOWS_UWP || DOTNETWINRT_PRESENT
         }
 
         private readonly Dictionary<TrackedHandJoint, MixedRealityPose> unityJointPoses = new Dictionary<TrackedHandJoint, MixedRealityPose>();
         private readonly ArticulatedHandDefinition handDefinition;
         private readonly WindowsMixedRealityHandMeshProvider handMeshProvider;
+
+#if WINDOWS_UWP || DOTNETWINRT_PRESENT
         private readonly bool articulatedHandApiAvailable = false;
+#endif // WINDOWS_UWP || DOTNETWINRT_PRESENT
 
         #region IMixedRealityHand Implementation
 

diff --git a/...roviders/WindowsMixedReality/XRSDK/Controllers/WindowsMixedRealityXRSDKArticulatedHand.cs b/...roviders/WindowsMixedReality/XRSDK/Controllers/WindowsMixedRealityXRSDKArticulatedHand.cs
@@ -63,9 +63,6 @@ public WindowsMixedRealityXRSDKArticulatedHand(
 
         #region IMixedRealityHand Implementation
 
-        /// <inheritdoc/>
-        public bool IsJointDataAvailable => jointPoses != null;
-
         /// <inheritdoc/>
         public bool TryGetJoint(TrackedHandJoint joint, out MixedRealityPose pose)
         {

diff --git a/Assets/MRTK/SDK/Features/UX/Scripts/RiggedHandVisualizer/RiggedHandVisualizer.cs b/Assets/MRTK/SDK/Features/UX/Scripts/RiggedHandVisualizer/RiggedHandVisualizer.cs
@@ -305,7 +305,7 @@ protected override bool UpdateHandJoints()
                 MixedRealityHandTrackingProfile handTrackingProfile = inputSystem?.InputSystemProfile != null ? inputSystem.InputSystemProfile.HandTrackingProfile : null;
 
                 // Only runs if render hand mesh is true
-                bool renderHandmesh = handTrackingProfile != null && handTrackingProfile.EnableHandMeshVisualization && MixedRealityHand.IsJointDataAvailable;
+                bool renderHandmesh = handTrackingProfile != null && handTrackingProfile.EnableHandMeshVisualization && MixedRealityHand.TryGetJoint(TrackedHandJoint.Palm, out _);
                 HandRenderer.enabled = renderHandmesh;
                 if (renderHandmesh)
                 {