Fixes GazeManager reference without changing Awake to Start

Author: Stephen Hodgson

Assets/HoloToolkit/Input/Scripts/BasicCursor.cs

@@ -28,14 +28,10 @@ public struct RaycastResult
 
         private bool hasLoggedGazeManagerError;
 
-        protected virtual void Start()
-        {
-            if ((GazeManager.Instance.RaycastLayerMask & (1 << gameObject.layer)) != 0)
-            {
-                Debug.LogError("The cursor has a layer that is checked in the GazeManager's Raycast Layer Mask.  Change the cursor layer (e.g.: to Ignore Raycast) or uncheck the layer in GazeManager: " +
-                    LayerMask.LayerToName(gameObject.layer));
-            }
+        private GazeManager gazeManagerReference;
 
+        protected virtual void Awake()
+        {
             meshRenderer = gameObject.GetComponent<MeshRenderer>();
 
             if (meshRenderer == null)
@@ -51,6 +47,24 @@ protected virtual void Start()
             cursorDefaultRotation = gameObject.transform.rotation;
         }
 
+        private bool GetGazeManagerReference()
+        {
+            gazeManagerReference = GazeManager.Instance;
+
+            if (gazeManagerReference == null)
+            {
+                return false;
+            }
+
+            if ((GazeManager.Instance.RaycastLayerMask & (1 << gameObject.layer)) != 0)
+            {
+                Debug.LogError("The cursor has a layer that is checked in the GazeManager's Raycast Layer Mask.  Change the cursor layer (e.g.: to Ignore Raycast) or uncheck the layer in GazeManager: " +
+                    LayerMask.LayerToName(gameObject.layer));
+            }
+
+            return true;
+        }
+
         protected virtual RaycastResult CalculateRayIntersect()
         {
             RaycastResult result = new RaycastResult();
@@ -76,6 +90,12 @@ protected virtual void LateUpdate()
                 return;
             }
 
+            if (gazeManagerReference == null)
+            {
+                if (!GetGazeManagerReference())
+                    return;
+            }
+
             // Calculate the raycast result
             RaycastResult rayResult = CalculateRayIntersect();