Merge pull request #2695 from StephenHodgson/vNEXT-FocusProviderFix

Focus Provider Registration Fix

Author: David Kline

Assets/MixedRealityToolkit-SDK/Features/Input/FocusProvider.cs

@@ -231,6 +231,11 @@ private void Awake()
                                  "To create a UIRaycastCamera in your scene, find this Focus Provider GameObject and add one there.");
                 CreateUiRaycastCamera();
             }
+
+            foreach (var inputSource in InputSystem.DetectedInputSources)
+            {
+                RegisterPointers(inputSource);
+            }
         }
 
         private void Update()
@@ -432,6 +437,23 @@ public bool RegisterPointer(IMixedRealityPointer pointer)
             return true;
         }
 
+        private void RegisterPointers(IMixedRealityInputSource inputSource)
+        {
+            // If our input source does not have any pointers, then skip.
+            if (inputSource.Pointers == null) { return; }
+
+            for (int i = 0; i < inputSource.Pointers.Length; i++)
+            {
+                RegisterPointer(inputSource.Pointers[i]);
+
+                // Special Registration for Gaze
+                if (inputSource.SourceId == InputSystem.GazeProvider.GazeInputSource.SourceId && gazeProviderPointingData == null)
+                {
+                    gazeProviderPointingData = new PointerData(inputSource.Pointers[i]);
+                }
+            }
+        }
+
         /// <inheritdoc />
         public bool UnregisterPointer(IMixedRealityPointer pointer)
         {
@@ -816,30 +838,13 @@ private void UpdateFocusedObjects()
 
         #region ISourceState Implementation
 
+        /// <inheritdoc />
         public void OnSourceDetected(SourceStateEventData eventData)
         {
-            // If our input source does not have any pointers, then skip.
-            if (eventData.InputSource.Pointers == null) { return; }
-
-            for (var i = 0; i < eventData.InputSource.Pointers.Length; i++)
-            {
-                RegisterPointer(eventData.InputSource.Pointers[i]);
-
-                // Special Registration for Gaze
-                if (eventData.InputSource.SourceId == InputSystem.GazeProvider.GazeInputSource.SourceId)
-                {
-                    Debug.Assert(gazeProviderPointingData == null, "Gaze Provider Pointer Data was already registered!");
-
-                    if (gazeProviderPointingData == null)
-                    {
-                        gazeProviderPointingData = new PointerData(eventData.InputSource.Pointers[i]);
-                    }
-
-                    Debug.Assert(gazeProviderPointingData != null);
-                }
-            }
+            RegisterPointers(eventData.InputSource);
         }
 
+        /// <inheritdoc />
         public void OnSourceLost(SourceStateEventData eventData)
         {
             // If the input source does not have pointers, then skip.