Added suggestions from Lars about directly getting the pointer extent instead of searching though our index of pointers.

Author: StephenHodgson

Assets/HoloToolkit/Input/Scripts/Focus/FocusManager.cs

@@ -292,9 +292,11 @@ public void UnregisterPointer(IPointingSource pointingSource)
 
             int pointerIndex;
             TryGetPointerIndex(pointingSource, out pointerIndex);
+            Debug.Assert(pointerIndex > 0, "Invalid pointer index!");
 
             PointerData pointer;
-            GetPointer(pointingSource, out pointer);
+            GetPointerData(pointingSource, out pointer);
+            Debug.Assert(pointer != null, "Attempting to unregister a pointer that was never registered!");
 
             // Should we be protecting against unregistering the GazeManager?
 
@@ -378,7 +380,7 @@ public FocusDetails GetFocusDetails(IPointingSource pointingSource)
             PointerData pointerData;
             FocusDetails details = default(FocusDetails);
 
-            if (GetPointer(pointingSource, out pointerData))
+            if (GetPointerData(pointingSource, out pointerData))
             {
                 details = pointerData.End;
             }
@@ -391,7 +393,7 @@ public GameObject GetFocusedObject(IPointingSource pointingSource)
             PointerData pointerData;
             GameObject focusedObject = null;
 
-            if (GetPointer(pointingSource, out pointerData))
+            if (GetPointerData(pointingSource, out pointerData))
             {
                 focusedObject = pointerData.End.Object;
             }
@@ -438,18 +440,12 @@ public PointerInputEventData GetGazePointerEventData()
         public PointerInputEventData GetSpecificPointerEventData(IPointingSource pointer)
         {
             PointerData pointerEventData;
-            return GetPointer(pointer, out pointerEventData) ? pointerEventData.UnityUIPointerData : null;
+            return GetPointerData(pointer, out pointerEventData) ? pointerEventData.UnityUIPointerData : null;
         }
 
         public float GetPointingExtent(IPointingSource pointingSource)
         {
-            PointerData pointerData;
-            return GetPointer(pointingSource, out pointerData) ? GetPointingExtent(pointerData) : pointingExtent;
-        }
-
-        private float GetPointingExtent(PointerData pointer)
-        {
-            return pointer.PointingSource.ExtentOverride ?? pointingExtent;
+            return pointingSource.ExtentOverride ?? pointingExtent;
         }
 
         #endregion
@@ -543,10 +539,10 @@ private void UpdatePointer(PointerData pointer)
         /// </summary>
         private void RaycastPhysics(PointerData pointer, LayerMask[] prioritizedLayerMasks)
         {
-            RaycastHit physicsHit = default(RaycastHit);
-            RayStep rayStep = default(RayStep);
             bool isHit = false;
             int rayStepIndex = 0;
+            RayStep rayStep = default(RayStep);
+            RaycastHit physicsHit = default(RaycastHit);
 
             Debug.Assert(pointer.PointingSource.Rays != null, "No valid rays for " + pointer.GetType());
             Debug.Assert(pointer.PointingSource.Rays.Length > 0, "No valid rays for " + pointer.GetType());
@@ -571,7 +567,7 @@ private void RaycastPhysics(PointerData pointer, LayerMask[] prioritizedLayerMas
             }
             else
             {
-                pointer.UpdateHit(GetPointingExtent(pointer));
+                pointer.UpdateHit(GetPointingExtent(pointer.PointingSource));
             }
         }
 
@@ -795,7 +791,7 @@ private void RaisePointerSpecificFocusChangedEvents(IPointingSource pointer, Gam
             }
         }
 
-        private bool GetPointer(IPointingSource pointingSource, out PointerData pointerData)
+        private bool GetPointerData(IPointingSource pointingSource, out PointerData pointerData)
         {
             int pointerIndex;