fixed gaze target not set for unity ui / added tests

Author: bethalha-havok

Assets/MixedRealityToolkit.Services/InputSystem/FocusProvider.cs

@@ -255,6 +255,12 @@ public void Set(MixedRealityRaycastHit hit, RayStep ray, int rayStepIndex, float
             public void Set(RaycastResult result, Vector3 hitPointOnObject, Vector4 hitNormalOnObject, RayStep ray, int rayStepIndex, float rayDistance)
             {
                 raycastHit = default(MixedRealityRaycastHit);
+                raycastHit.point = hitPointOnObject;
+                raycastHit.normal = hitNormalOnObject;
+                raycastHit.distance = rayDistance;
+                raycastHit.transform = result.gameObject.transform;
+                raycastHit.raycastValid = false;
+
                 graphicsRaycastResult = result;
 
                 this.hitObject = result.gameObject;
@@ -264,6 +270,7 @@ public void Set(RaycastResult result, Vector3 hitPointOnObject, Vector4 hitNorma
                 this.ray = ray;
                 this.rayStepIndex = rayStepIndex;
                 this.rayDistance = rayDistance;
+                
             }
         }
 
@@ -557,10 +564,17 @@ private void UpdateGazeProvider()
                 LayerMask[] prioritizedLayerMasks = (gazeProviderPointingData.Pointer.PrioritizedLayerMasksOverride ?? FocusLayerMasks);
                 QueryScene(gazeProviderPointingData.Pointer, raycastProvider, prioritizedLayerMasks,
                     hitResult3d, maxQuerySceneResults, focusIndividualCompoundCollider);
-                gazeHitResult = hitResult3d;
+                //gazeHitResult = hitResult3d;
+
+                hitResultUi.Clear();
+                RaycastGraphics(gazeProviderPointingData.Pointer, gazeProviderPointingData.GraphicEventData, prioritizedLayerMasks, hitResultUi);
+
+                gazeHitResult = GetPrioritizedHitResult(hitResult3d, hitResultUi, prioritizedLayerMasks);
+                TruncatePointerRayToHit(gazeProviderPointingData.Pointer, gazeHitResult);
             }
 
             CoreServices.InputSystem.GazeProvider.UpdateGazeInfoFromHit(gazeHitResult.raycastHit);
+            Debug.LogWarning((gazeHitResult.raycastHit.transform != null) ? gazeHitResult.raycastHit.transform.name : "nothing");
 
             // Zero out value after every use to ensure the hit result is updated every frame.
             gazeHitResult = null;
@@ -957,11 +971,6 @@ private void UpdatePointer(PointerData pointerData)
                     hitResult3d.Clear();
                     QueryScene(pointerData.Pointer, raycastProvider, prioritizedLayerMasks, hitResult3d, maxQuerySceneResults, focusIndividualCompoundCollider);
 
-                    if (pointerData.Pointer.PointerId == gazeProviderPointingData.Pointer.PointerId)
-                    {
-                        gazeHitResult = hitResult3d;
-                    }
-
                     int hitResult3dLayer = hitResult3d.hitObject != null ? hitResult3d.hitObject.layer : -1;
                     if (hitResult3dLayer == 0)
                     {
@@ -982,6 +991,8 @@ private void UpdatePointer(PointerData pointerData)
                         hit = GetPrioritizedHitResult(hit, hitResultUi, prioritizedLayerMasks);
                     }
 
+                   
+
                     if (hit != hitResult3d || hitResult3dLayer > 0)
                     {
                         // Truncate if we didn't already for this hit
@@ -997,6 +1008,12 @@ private void UpdatePointer(PointerData pointerData)
                     // Apply the hit result only now so changes in the current target are detected only once per frame.
                     pointerData.UpdateHit(hit);
 
+                    // set gaze hit result - make sure to include unity ui hits
+                    if (pointerData.Pointer.PointerId == gazeProviderPointingData.Pointer.PointerId)
+                    {
+                        gazeHitResult = hit;
+                    }
+
                     // Set the pointer's result last
                     pointerData.Pointer.Result = pointerData;
                 }

Assets/MixedRealityToolkit.Tests/PlayModeTests/FocusProviderTests.cs

@@ -18,6 +18,7 @@
 using Microsoft.MixedReality.Toolkit.Utilities;
 using System.Linq;
 using Microsoft.MixedReality.Toolkit.UI;
+using Microsoft.MixedReality.Toolkit.Input.Utilities;
 
 namespace Microsoft.MixedReality.Toolkit.Tests
 {
@@ -92,6 +93,41 @@ public IEnumerator TestGazeProviderTargetNotNull()
             Assert.NotNull(CoreServices.InputSystem.GazeProvider.GazeTarget, "GazeProvider target is null when looking at an object with hand raised");
         }
 
+        [UnityTest]
+        public IEnumerator TestGazeProviderTargetUnityUi()
+        {
+            TestUtilities.PlayspaceToOriginLookingForward();
+
+            // spawn 3d object 
+            var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
+            cube.transform.position = Vector3.forward;
+            cube.transform.localScale = Vector3.one * 0.5f;
+            yield return null;
+            yield return null;
+
+            // make sure we get the 3d object as a gaze target
+            Assert.AreEqual(CoreServices.InputSystem.GazeProvider.GazeTarget, cube, "GazeProvider target is not set to 3d object (cube)");
+
+           // yield return PlayModeTestUtilities.WaitForEnterKey();
+
+            // spawn 2d unity ui
+            var canvas = UnityUiUtilities.CreateCanvas(0.002f);
+            var toggle = UnityUiUtilities.CreateToggle(Color.gray, Color.blue, Color.green);
+            toggle.transform.SetParent(canvas.transform, false);
+            canvas.transform.position = Vector3.forward * 0.5f;
+
+            yield return null;
+            yield return null;
+
+
+            //yield return PlayModeTestUtilities.WaitForEnterKey();
+
+            // check if gaze target has changed to unity ui
+            Assert.AreEqual(CoreServices.InputSystem.GazeProvider.GazeTarget, toggle.gameObject, "GazeProvider target is not set to toggle unity ui");
+
+            yield return null;
+        }
+
         /// <summary>
         /// Ensure FocusProvider's FocusDetails can be overridden.
         /// </summary>