Fixed for eye gaze pinch controls and fix pointer naming bug

Author: RogPodge

Assets/MRTK/Examples/Demos/EyeTracking/DemoTargetPositioning/Scripts/MoveObjByEyeGaze.cs

@@ -282,63 +282,39 @@ void IMixedRealitySourceStateHandler.OnSourceDetected(SourceStateEventData event
 
         void IMixedRealitySourceStateHandler.OnSourceLost(SourceStateEventData eventData)
         {
-            if (IsActiveHand(eventData.InputSource.SourceName))
+            if ((currEngagedHand == Handedness.Right && eventData.Controller.ControllerHandedness == Handedness.Right) ||
+                (currEngagedHand == Handedness.Left && eventData.Controller.ControllerHandedness == Handedness.Left))
             {
                 HandDrag_Stop();
             }
         }
 
         void IMixedRealityPointerHandler.OnPointerUp(MixedRealityPointerEventData eventData)
         {
-            if (IsActiveHand(eventData.InputSource.SourceName))
+            if ((currEngagedHand == Handedness.Right && eventData.Handedness == Handedness.Right) ||
+                (currEngagedHand == Handedness.Left && eventData.Handedness == Handedness.Left))
             {
                 HandDrag_Stop();
             }
         }
 
         void IMixedRealityPointerHandler.OnPointerDown(MixedRealityPointerEventData eventData)
         {
-            if (SetActiveHand(eventData.InputSource.SourceName))
-            {
-                HandDrag_Start();
-            }
-        }
-
-        void IMixedRealityPointerHandler.OnPointerClicked(MixedRealityPointerEventData eventData) { }
-        #endregion
 
-        private bool SetActiveHand(string sourcename)
-        {
             if (currEngagedHand == Handedness.None)
             {
-                if ((sourcename == "Right Hand") || (sourcename == "Mixed Reality Controller Right"))
-                {
-                    currEngagedHand = Handedness.Right;
-                }
-                else if ((sourcename == "Left Hand") || (sourcename == "Mixed Reality Controller Left"))
-                {
-                    currEngagedHand = Handedness.Left;
-                }
-
-                if (currEngagedHand != Handedness.None)
-                {
-                    return true;
-                }
+                currEngagedHand = eventData.Handedness;
             }
-            return false;
-        }
-
-        private bool IsActiveHand(string sourcename)
-        {
 
-            if (((currEngagedHand == Handedness.Right) && ((sourcename == "Right Hand") || (sourcename == "Mixed Reality Controller Right"))) ||
-                ((currEngagedHand == Handedness.Left) && ((sourcename == "Left Hand") || (sourcename == "Mixed Reality Controller Left"))))
+            if (currEngagedHand != Handedness.None)
             {
-                return true;
+                HandDrag_Start();
             }
-            return false;
         }
 
+        void IMixedRealityPointerHandler.OnPointerClicked(MixedRealityPointerEventData eventData) { }
+        #endregion
+
         /// <summary>
         /// Start moving the target using your hands.
         /// </summary>

Assets/MRTK/SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs

@@ -99,7 +99,7 @@ public virtual void SetCursor(GameObject newCursor = null)
 
                 if (cursorInstance != null)
                 {
-                    cursorInstance.name = $"{Handedness}_{name}_Cursor";
+                    cursorInstance.name = $"{name}_Cursor";
 
                     BaseCursor oldC = BaseCursor as BaseCursor;
                     if (oldC != null && enabled)
@@ -168,6 +168,9 @@ protected override async void Start()
 
             await EnsureInputSystemValid();
 
+            // Setting the pointerName
+            PointerName = $"{Handedness}_{gameObject.name}";
+
             // We've been destroyed during the await.
             if (this == null)
             {
@@ -227,7 +230,6 @@ public override IMixedRealityController Controller
 
                 if (base.Controller != null && this != null)
                 {
-                    PointerName = $"{Handedness}_{gameObject.name}";
                     InputSourceParent = base.Controller.InputSource;
                     SetCursor();
                 }