Skip to content

Commit 7c9e8a5

Browse files
committed
Properly handle Handedness.None in GetControllerNode
1 parent cbc62f8 commit 7c9e8a5

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

org.mixedrealitytoolkit.spatialmanipulation/Solvers/HandConstraint.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,6 @@ public override void SolverUpdate()
222222
return;
223223
}
224224

225-
XRNode? prevTrackedNode = trackedNode;
226-
227225
if (SolverHandler.CurrentTrackedHandedness != Handedness.None)
228226
{
229227
trackedNode = GetControllerNode(SolverHandler.CurrentTrackedHandedness);
@@ -257,8 +255,7 @@ public override void SolverUpdate()
257255
}
258256

259257
// Calculate if events should be fired
260-
Handedness newHandedness = (trackedNode.HasValue && SolverHandler.IsHandTracked(trackedNode.Value.ToHandedness())) ? trackedNode.Value.ToHandedness() : Handedness.None;
261-
258+
Handedness newHandedness = trackedNode.HasValue ? trackedNode.Value.ToHandedness() : Handedness.None;
262259
if (previousHandedness == Handedness.None && newHandedness != Handedness.None)
263260
{
264261
previousHandedness = newHandedness;
@@ -683,8 +680,7 @@ private bool IsPalmFacingCamera(XRNode? hand)
683680
/// <returns>The IMixedRealityController for the desired handedness, or null if none are present.</returns>
684681
protected XRNode? GetControllerNode(Handedness handedness)
685682
{
686-
if (!SolverHandler.IsValidHandedness(handedness)) { return null; }
687-
return (handedness == Handedness.Left) ? XRNode.LeftHand : XRNode.RightHand;
683+
return !SolverHandler.IsValidHandedness(handedness) ? null : handedness.ToXRNode();
688684
}
689685

690686
#region MonoBehaviour Implementation

0 commit comments

Comments
 (0)