Eyetracking QoL and updating test icons (#9704)

* Allow the user to define a box collider on the parent object of the object referencing the eyetracking target script and still have it recognized as a valid lookateyetarget

* Update the eyetracking target to implement null checking on the OnLookStart and WhileLookingAtTarget callbacks

* Update a broken api call int the updatetestscripticons method

* Update the test icons for the new eyetrackingtargettest class

* Reverting nested children change, updated test icons

* test adjustment

* made an explicit null check

* fixing CI complaints

Co-authored-by: peader <peader.com>

Author: RogPodge

Assets/MRTK/SDK/Features/Input/Handlers/EyeTrackingTarget.cs

@@ -260,8 +260,11 @@ private void UpdateHitTarget()
 
                     if (isHit)
                     {
-                        LookedAtTarget = hitInfo.collider.gameObject;
-                        LookedAtEyeTarget = LookedAtTarget.GetComponent<EyeTrackingTarget>();
+                        LookedAtEyeTarget = hitInfo.collider.transform.GetComponent<EyeTrackingTarget>();
+                        if(LookedAtEyeTarget != null)
+                        {
+                            LookedAtTarget = LookedAtEyeTarget.gameObject;
+                        }
                         LookedAtPoint = hitInfo.point;
                     }
                     else
@@ -282,12 +285,12 @@ protected void OnEyeFocusStart()
         {
             lookAtStartTime = DateTime.UtcNow;
             IsLookedAt = true;
-            OnLookAtStart.Invoke();
+            OnLookAtStart?.Invoke();
         }
 
         protected void OnEyeFocusStay()
         {
-            WhileLookingAtTarget.Invoke();
+            WhileLookingAtTarget?.Invoke();
 
             if ((!IsDwelledOn) && (DateTime.UtcNow - lookAtStartTime).TotalSeconds > dwellTimeInSec)
             {
@@ -305,7 +308,7 @@ protected void OnEyeFocusStop()
         {
             IsDwelledOn = false;
             IsLookedAt = false;
-            OnLookAway.Invoke();
+            OnLookAway?.Invoke();
         }
 
         #endregion 

Assets/MRTK/Tests/EditModeTests/Core/Definitions/Utilities/MixedRealityPoseTests.cs.meta

@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#if !WINDOWS_UWP
+// When the .NET scripting backend is enabled and C# projects are built
+// The assembly that this file is part of is still built for the player,
+// even though the assembly itself is marked as a test assembly (this is not
+// expected because test assemblies should not be included in player builds).
+// Because the .NET backend is deprecated in 2018 and removed in 2019 and this
+// issue will likely persist for 2018, this issue is worked around by wrapping all
+// play mode tests in this check.
+
+using Microsoft.MixedReality.Toolkit.Input;
+using NUnit.Framework;
+using System.Collections;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Microsoft.MixedReality.Toolkit.Tests.Input
+{
+    // tests for eyetracking
+    public class EyeTrackingTargetTest
+    {
+        // Assets/MRTK/Examples/Demos/EyeTracking/General/Profiles/EyeTrackingDemoConfigurationProfile.asset
+        private const string eyeTrackingConfigurationProfileGuid = "6615cacb3eaaa044f99b917186093aeb";
+
+        private static readonly string eyeTrackingConfigurationProfilePath = AssetDatabase.GUIDToAssetPath(eyeTrackingConfigurationProfileGuid);
+
+        private GameObject target;
+
+        // This method is called once before we enter play mode and execute any of the tests
+        // do any kind of setup here that can't be done in playmode
+        [SetUp]
+        public void Setup()
+        {
+            PlayModeTestUtilities.Setup();
+            TestUtilities.PlayspaceToOriginLookingForward();
+        }
+
+        // Destroy the scene - this method is called after each test listed below has completed
+        [TearDown]
+        public void TearDown()
+        {
+            PlayModeTestUtilities.TearDown();
+        }
+
+        #region Tests
+
+        /// <summary>
+        /// Skeleton for a new MRTK play mode test.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator TestEyeTrackingTarget()
+        {
+            // Eye tracking configuration profile should set eye based gaze
+            var profile = AssetDatabase.LoadAssetAtPath(eyeTrackingConfigurationProfilePath, typeof(MixedRealityToolkitConfigurationProfile)) as MixedRealityToolkitConfigurationProfile;
+            MixedRealityToolkit.Instance.ResetConfiguration(profile);
+
+            // Reset view to origin
+            MixedRealityPlayspace.PerformTransformation(p =>
+            {
+                p.position = Vector3.zero;
+                p.LookAt(Vector3.forward);
+            });
+
+            string targetName = "eyetrackingTargetObject";
+
+            var eyetrackingTargetObject = GameObject.CreatePrimitive(PrimitiveType.Cube);
+            eyetrackingTargetObject.name = targetName;
+            var eyeTrackingTargetComponent = eyetrackingTargetObject.AddComponent<EyeTrackingTarget>();
+            eyetrackingTargetObject.transform.position = Vector3.forward;
+
+            // We need to simulate an eye in the direction of the parent object
+            var inputSimulationService = PlayModeTestUtilities.GetInputSimulationService();
+            // We don't need any other input just eye gaze
+            inputSimulationService.UserInputEnabled = false;
+            inputSimulationService.EyeGazeSimulationMode = EyeGazeSimulationMode.CameraForwardAxis;
+
+            yield return null;
+
+            var isEyeGazeActive = InputRayUtils.TryGetEyeGazeRay(out var eyegazeRay);
+            Assert.True(isEyeGazeActive);
+            yield return null;
+            Assert.True(EyeTrackingTarget.LookedAtTarget != null);
+            Assert.True(EyeTrackingTarget.LookedAtEyeTarget.name == targetName);
+        }
+        #endregion
+    }
+}
+#endif