Merge pull request #805 from StephenHodgson/HTK-uGUIRaycast

Updated GazeManager uGUI raycast calculations & GazeTransform initialization

Author: StephenHodgson

Assets/HoloToolkit/Input/Scripts/Gaze/GazeManager.cs

@@ -93,7 +93,7 @@ public class GazeManager : Singleton<GazeManager>
         public PointerEventData UnityUIPointerEvent { get; private set; }
 
         /// <summary>
-        /// Cached results of racast results.
+        /// Cached results of raycast results.
         /// </summary>
         private List<RaycastResult> raycastResultList = new List<RaycastResult>();
 
@@ -106,26 +106,13 @@ protected override void Awake()
             {
                 RaycastLayerMasks = new LayerMask[] { Physics.DefaultRaycastLayers };
             }
-        }
 
-        private void Start()
-        {
-            if (GazeTransform == null)
-            {
-                if (Camera.main != null)
-                {
-                    GazeTransform = Camera.main.transform;
-                }
-                else
-                {
-                    Debug.LogError("Gaze Manager was not given a GazeTransform and no main camera exists to default to.");
-                }
-            }
+            FindGazeTransform();
         }
 
         private void Update()
         {
-            if (GazeTransform == null)
+            if (!FindGazeTransform())
             {
                 return;
             }
@@ -149,6 +136,20 @@ private void Update()
             }
         }
 
+        private bool FindGazeTransform()
+        {
+            if (GazeTransform != null) { return true; }
+
+            if (Camera.main != null)
+            {
+                GazeTransform = Camera.main.transform;
+                return true;
+            }
+
+            Debug.LogError("Gaze Manager was not given a GazeTransform and no main camera exists to default to.");
+            return false;
+        }
+
         /// <summary>
         /// Updates the current gaze information, so that the gaze origin and normal are accurate.
         /// </summary>
@@ -225,15 +226,12 @@ private void RaycastUnityUI()
             // Graphics raycast
             raycastResultList.Clear();
             EventSystem.current.RaycastAll(UnityUIPointerEvent, raycastResultList);
-            RaycastResult uiRaycastResult = FindClosestRaycastHitInLayermasks(raycastResultList, RaycastLayerMasks);
+            RaycastResult uiRaycastResult = FindClosestRaycastHitInLayerMasks(raycastResultList, RaycastLayerMasks);
             UnityUIPointerEvent.pointerCurrentRaycast = uiRaycastResult;
 
             // If we have a raycast result, check if we need to overwrite the 3D raycast info
             if (uiRaycastResult.gameObject != null)
             {
-                // Add the near clip distance since this is where the raycast is from
-                float uiRaycastDistance = uiRaycastResult.distance + Camera.main.nearClipPlane;
-
                 bool superseded3DObject = false;
                 if (IsGazingAtObject)
                 {
@@ -250,15 +248,15 @@ private void RaycastUnityUI()
                         }
                         else if (threeDLayerIndex == uiLayerIndex)
                         {
-                            if (hitInfo.distance > uiRaycastDistance)
+                            if (hitInfo.distance > uiRaycastResult.distance)
                             {
                                 superseded3DObject = true;
                             }
                         }
                     }
                     else
                     {
-                        if (hitInfo.distance > uiRaycastDistance)
+                        if (hitInfo.distance > uiRaycastResult.distance)
                         {
                             superseded3DObject = true;
                         }
@@ -269,10 +267,10 @@ private void RaycastUnityUI()
                 if (!IsGazingAtObject || superseded3DObject)
                 {
                     IsGazingAtObject = true;
-                    Vector3 worldPos = Camera.main.ScreenToWorldPoint(new Vector3(uiRaycastResult.screenPosition.x, uiRaycastResult.screenPosition.y, uiRaycastDistance));
-                    hitInfo = new RaycastHit()
+                    Vector3 worldPos = Camera.main.ScreenToWorldPoint(new Vector3(uiRaycastResult.screenPosition.x, uiRaycastResult.screenPosition.y, uiRaycastResult.distance));
+                    hitInfo = new RaycastHit
                     {
-                        distance = uiRaycastDistance,
+                        distance = uiRaycastResult.distance,
                         normal = -Camera.main.transform.forward,
                         point = worldPos
                     };
@@ -292,7 +290,7 @@ private void RaycastUnityUI()
         /// <param name="candidates">List of RaycastResults from a Unity UI raycast</param>
         /// <param name="layerMaskList">List of layers to support</param>
         /// <returns>RaycastResult if hit, or an empty RaycastResult if nothing was hit</returns>
-        private RaycastResult FindClosestRaycastHitInLayermasks(List<RaycastResult> candidates, LayerMask[] layerMaskList)
+        private RaycastResult FindClosestRaycastHitInLayerMasks(List<RaycastResult> candidates, LayerMask[] layerMaskList)
         {
             int combinedLayerMask = 0;
             for (int i = 0; i < layerMaskList.Length; i++)
@@ -313,9 +311,9 @@ private RaycastResult FindClosestRaycastHitInLayermasks(List<RaycastResult> cand
                 }
             }
 
-             return minHit ?? new RaycastResult();
+            return minHit ?? new RaycastResult();
         }
-        
+
         /// <summary>
         /// Look through the layerMaskList and find the index in that list for which the supplied layer is part of
         /// </summary>