Reverted the unregistering of pointers on source lost.

Updated internal pointer utilities.
misc formatting.

Author: StephenHodgson

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

@@ -51,19 +51,7 @@ protected override void Awake()
 
         private void Start()
         {
-            if (gazeManagerPointingData == null)
-            {
-                if (GazeManager.IsInitialized)
-                {
-                    gazeManagerPointingData = new PointerData(GazeManager.Instance);
-                }
-            }
-            else
-            {
-                Debug.Assert(ReferenceEquals(gazeManagerPointingData.PointingSource, GazeManager.Instance));
-            }
-
-            if ((pointers.Count == 0) && autoRegisterGazePointerIfNoPointersRegistered && GazeManager.IsInitialized)
+            if (pointers.Count == 0 && autoRegisterGazePointerIfNoPointersRegistered && GazeManager.IsInitialized)
             {
                 RegisterPointer(GazeManager.Instance);
             }
@@ -261,27 +249,33 @@ public Camera UIRaycastCamera
 
         public void RegisterPointer(IPointingSource pointingSource)
         {
-            Debug.Assert(pointingSource != null);
+            Debug.Assert(pointingSource != null, "Can't register a pointer if you give us one.");
+
+            int pointerIndex;
+            PointerData pointer;
 
-            if (TryGetPointerIndex(pointingSource) != null)
+            if (TryGetPointerIndex(pointingSource, out pointerIndex))
             {
                 // This pointing source is already registered and active.
                 return;
             }
 
-            PointerData pointer;
-
             if (pointingSource is GazeManager)
             {
                 if (gazeManagerPointingData == null)
                 {
-                    gazeManagerPointingData = new PointerData(pointingSource);
+                    if (GazeManager.IsInitialized)
+                    {
+                        gazeManagerPointingData = new PointerData(GazeManager.Instance);
+                    }
                 }
                 else
                 {
+                    Debug.Assert(ReferenceEquals(gazeManagerPointingData.PointingSource, GazeManager.Instance));
                     gazeManagerPointingData.ResetFocusedObjects();
                 }
 
+                Debug.Assert(gazeManagerPointingData != null);
                 pointer = gazeManagerPointingData;
             }
             else
@@ -294,14 +288,17 @@ public void RegisterPointer(IPointingSource pointingSource)
 
         public void UnregisterPointer(IPointingSource pointingSource)
         {
-            Debug.Assert(pointingSource != null);
+            Debug.Assert(pointingSource != null, "Can't unregister a pointer if you give us one.");
 
-            int? iPointer = TryGetPointerIndex(pointingSource);
-            Debug.Assert(iPointer != null);
+            int pointerIndex;
+            TryGetPointerIndex(pointingSource, out pointerIndex);
+
+            PointerData pointer;
+            GetPointer(pointingSource, out pointer);
 
-            PointerData pointer = pointers[iPointer.Value];
+            // Should we be protecting against unregistering the GazeManager?
 
-            pointers.RemoveAt(iPointer.Value);
+            pointers.RemoveAt(pointerIndex);
 
             // Raise focus events if needed:
 
@@ -331,13 +328,11 @@ public void UnregisterPointer(IPointingSource pointingSource)
 
         public FocusDetails? TryGetFocusDetails(BaseEventData eventData)
         {
-            for (int iPointer = 0; iPointer < pointers.Count; iPointer++)
+            for (int i = 0; i < pointers.Count; i++)
             {
-                PointerData pointer = pointers[iPointer];
-
-                if (pointer.PointingSource.OwnsInput(eventData))
+                if (pointers[i].PointingSource.OwnsInput(eventData))
                 {
-                    return pointer.End;
+                    return pointers[i].End;
                 }
             }
 
@@ -356,20 +351,20 @@ public GameObject TryGetFocusedObject(BaseEventData eventData)
             IPointingSource pointingSource;
             TryGetPointingSource(eventData, out pointingSource);
             PointerInputEventData pointerInputEventData = GetSpecificPointerEventData(pointingSource);
+
+            Debug.Assert(pointerInputEventData != null);
             pointerInputEventData.selectedObject = details.Value.Object;
 
             return details.Value.Object;
         }
 
         public bool TryGetPointingSource(BaseEventData eventData, out IPointingSource pointingSource)
         {
-            for (int iPointer = 0; iPointer < pointers.Count; iPointer++)
+            for (int i = 0; i < pointers.Count; i++)
             {
-                PointerData pointer = pointers[iPointer];
-
-                if (pointer.PointingSource.OwnsInput(eventData))
+                if (pointers[i].PointingSource.OwnsInput(eventData))
                 {
-                    pointingSource = pointer.PointingSource;
+                    pointingSource = pointers[i].PointingSource;
                     return true;
                 }
             }
@@ -380,12 +375,28 @@ public bool TryGetPointingSource(BaseEventData eventData, out IPointingSource po
 
         public FocusDetails GetFocusDetails(IPointingSource pointingSource)
         {
-            return GetPointer(pointingSource).End;
+            PointerData pointerData;
+            FocusDetails details = default(FocusDetails);
+
+            if (GetPointer(pointingSource, out pointerData))
+            {
+                details = pointerData.End;
+            }
+
+            return details;
         }
 
         public GameObject GetFocusedObject(IPointingSource pointingSource)
         {
-            return GetPointer(pointingSource).End.Object;
+            PointerData pointerData;
+            GameObject focusedObject = null;
+
+            if (GetPointer(pointingSource, out pointerData))
+            {
+                focusedObject = pointerData.End.Object;
+            }
+
+            return focusedObject;
         }
 
         /// <summary>
@@ -426,12 +437,19 @@ public PointerInputEventData GetGazePointerEventData()
 
         public PointerInputEventData GetSpecificPointerEventData(IPointingSource pointer)
         {
-            return GetPointer(pointer).UnityUIPointerData;
+            PointerData pointerEventData;
+            return GetPointer(pointer, out pointerEventData) ? pointerEventData.UnityUIPointerData : null;
         }
 
         public float GetPointingExtent(IPointingSource pointingSource)
         {
-            return GetPointingExtent(GetPointer(pointingSource));
+            PointerData pointerData;
+            return GetPointer(pointingSource, out pointerData) ? GetPointingExtent(pointerData) : pointingExtent;
+        }
+
+        private float GetPointingExtent(PointerData pointer)
+        {
+            return pointer.PointingSource.ExtentOverride ?? pointingExtent;
         }
 
         #endregion
@@ -777,32 +795,33 @@ private void RaisePointerSpecificFocusChangedEvents(IPointingSource pointer, Gam
             }
         }
 
-        private PointerData GetPointer(IPointingSource pointingSource)
+        private bool GetPointer(IPointingSource pointingSource, out PointerData pointerData)
         {
-            Debug.Assert(pointers.Count > 0, "No Pointers registered!");
-            int? iPointer = TryGetPointerIndex(pointingSource);
-            return iPointer != null ? pointers[iPointer.Value] : pointers[0];
+            int pointerIndex;
+
+            if (TryGetPointerIndex(pointingSource, out pointerIndex))
+            {
+                pointerData = pointers[pointerIndex];
+                return true;
+            }
+
+            pointerData = null;
+            return false;
         }
 
-        private int? TryGetPointerIndex(IPointingSource pointingSource)
+        private bool TryGetPointerIndex(IPointingSource pointingSource, out int pointerIndex)
         {
-            int? found = null;
-
             for (int i = 0; i < pointers.Count; i++)
             {
-                if (pointers[i].PointingSource == pointingSource)
+                if (pointingSource == pointers[i].PointingSource)
                 {
-                    found = i;
-                    break;
+                    pointerIndex = i;
+                    return true;
                 }
             }
 
-            return found;
-        }
-
-        private float GetPointingExtent(PointerData pointer)
-        {
-            return (pointer.PointingSource.ExtentOverride ?? pointingExtent);
+            pointerIndex = -1;
+            return false;
         }
 
         private RaycastHit? PrioritizeHits(RaycastHit[] hits, LayerMask[] layerMasks)

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

@@ -51,7 +51,6 @@ public bool InteractionEnabled
         [Obsolete("Will be removed in a later version. Use OnPreRaycast / OnPostRaycast instead.")]
         public void UpdatePointer()
         {
-
         }
 
         public virtual void OnPreRaycast()
@@ -62,9 +61,9 @@ public virtual void OnPreRaycast()
             }
             else
             {
-                Debug.Assert(InputSource.SupportsInputInfo(InputSourceId, SupportedInputInfo.Pointing));
+                Debug.Assert(InputSource.SupportsInputInfo(InputSourceId, SupportedInputInfo.Pointing), string.Format("{0} with id {1} does not support pointing!", InputSource, InputSourceId));
 
-                Ray pointingRay = default(Ray);
+                Ray pointingRay;
                 if (InputSource.TryGetPointingRay(InputSourceId, out pointingRay))
                 {
                     rays[0].CopyRay(pointingRay, FocusManager.Instance.GetPointingExtent(this));

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

@@ -45,14 +45,12 @@ private void Start()
             started = true;
 
             InputManager.AssertIsInitialized();
-            GazeManager.AssertIsInitialized();
             FocusManager.AssertIsInitialized();
+            GazeManager.AssertIsInitialized();
 
             AddInputManagerListenerIfNeeded();
             FindCursorIfNeeded();
             ConnectBestAvailablePointer();
-
-            Debug.Assert(currentPointer != null, this);
         }
 
         private void OnEnable()
@@ -79,12 +77,6 @@ void ISourceStateHandler.OnSourceDetected(SourceStateEventData eventData)
 
         void ISourceStateHandler.OnSourceLost(SourceStateEventData eventData)
         {
-            IPointingSource pointingSource;
-            if (FocusManager.Instance.TryGetPointingSource(eventData, out pointingSource))
-            {
-                FocusManager.Instance.UnregisterPointer(pointingSource);
-            }
-
             if (IsInputSourcePointerActive && inputSourcePointer.InputIsFromSource(eventData))
             {
                 ConnectBestAvailablePointer();
@@ -162,6 +154,11 @@ private void SetPointer(IPointingSource newPointer)
         {
             if (currentPointer != newPointer)
             {
+                if (currentPointer != null)
+                {
+                    FocusManager.Instance.UnregisterPointer(currentPointer);
+                }
+
                 currentPointer = newPointer;
 
                 if (newPointer != null)
@@ -174,6 +171,8 @@ private void SetPointer(IPointingSource newPointer)
                     Cursor.Pointer = newPointer;
                 }
             }
+
+            Debug.Assert(currentPointer != null, "No Pointer Set!");
         }
 
         private void ConnectBestAvailablePointer()
@@ -229,7 +228,6 @@ private void HandleInputAction(InputEventData eventData)
                     // TODO: robertes: see if we can treat voice separately from the other simple committers,
                     //       so voice doesn't steal from a pointing controller. I think input Kind would need
                     //       to come through with the event data.
-
                     SetPointer(GazeManager.Instance);
                     pointerWasChanged = true;
                 }

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

@@ -133,10 +133,7 @@ public LayerMask[] PrioritizedLayerMasksOverride
 
         public bool InteractionEnabled
         {
-            get
-            {
-                return true;
-            }
+            get { return true; }
         }
 
         private float lastHitDistance = 2.0f;