Merge branch 'vNEXT-CursorTest' into vNEXT-SpatialMouse

Author: StephenHodgson

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

@@ -1,16 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using Microsoft.MixedReality.Toolkit.InputSystem.Pointers;
-using Microsoft.MixedReality.Toolkit.InputSystem.Sources;
 using Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem;
 using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
 using Microsoft.MixedReality.Toolkit.Core.EventDatum.Input;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem.Handlers;
 using Microsoft.MixedReality.Toolkit.Core.Utilities;
+using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;
 using Microsoft.MixedReality.Toolkit.Core.Utilities.Physics;
+using Microsoft.MixedReality.Toolkit.InputSystem.Pointers;
+using Microsoft.MixedReality.Toolkit.InputSystem.Sources;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.SDK.Input
@@ -268,8 +269,10 @@ protected override void OnEnable()
             }
         }
 
-        protected virtual void Start()
+        protected override void Start()
         {
+            base.Start();
+
             if (cursorPrefab != null)
             {
                 var cursorObj = Instantiate(cursorPrefab, transform.parent);
@@ -335,7 +338,7 @@ protected override void OnDisable()
         {
             base.OnDisable();
             GazePointer.BaseCursor?.SetVisibility(false);
-            InputSystem.RaiseSourceLost(GazeInputSource);
+            InputSystem?.RaiseSourceLost(GazeInputSource);
         }
 
         #endregion MonoBehaviour Implementation
@@ -385,8 +388,9 @@ private IMixedRealityPointer InitializeGazePointer()
             return gazePointer = new InternalGazePointer(this, "Gaze Pointer", null, raycastLayerMasks, maxGazeCollisionDistance, gazeTransform, stabilizer);
         }
 
-        private void RaiseSourceDetected()
+        private async void RaiseSourceDetected()
         {
+            await WaitUntilInputSystemValid;
             InputSystem.RaiseSourceDetected(GazeInputSource);
             GazePointer.BaseCursor?.SetVisibility(true);
         }

Assets/MixedRealityToolkit-SDK/Features/Input/Handlers/SpeechInputHandler.cs

@@ -33,8 +33,10 @@ public class SpeechInputHandler : BaseInputHandler, IMixedRealitySpeechHandler
 
         #region MonoBehaviour Implementation
 
-        private void Start()
+        protected override void Start()
         {
+            base.Start();
+
             if (persistentKeywords)
             {
                 Debug.Assert(gameObject.transform.parent == null, "Persistent keyword GameObject must be at the root level of the scene hierarchy.");

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

@@ -3,6 +3,7 @@
 
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
 using Microsoft.MixedReality.Toolkit.Core.Managers;
+using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.SDK.Input
@@ -15,16 +16,31 @@ public class InputSystemGlobalListener : MonoBehaviour
         private static IMixedRealityInputSystem inputSystem = null;
         protected static IMixedRealityInputSystem InputSystem => inputSystem ?? (inputSystem = MixedRealityManager.Instance.GetManager<IMixedRealityInputSystem>());
 
+        private bool lateInitialize = true;
+
+        protected readonly WaitUntil WaitUntilInputSystemValid = new WaitUntil(() => InputSystem != null);
+
         protected virtual void OnEnable()
         {
-            Debug.Assert(MixedRealityManager.IsInitialized, "No Mixed Reality Manager found in the scene.  Be sure to run the Mixed Reality Configuration.");
-            Debug.Assert(InputSystem != null, "No Input System found, Did you set it up in your configuration profile?");
-            InputSystem.Register(gameObject);
+            if (MixedRealityManager.IsInitialized && InputSystem != null && !lateInitialize)
+            {
+                InputSystem.Register(gameObject);
+            }
+        }
+
+        protected virtual async void Start()
+        {
+            if (lateInitialize)
+            {
+                await WaitUntilInputSystemValid;
+                lateInitialize = false;
+                InputSystem.Register(gameObject);
+            }
         }
 
         protected virtual void OnDisable()
         {
-            InputSystem.Unregister(gameObject);
+            InputSystem?.Unregister(gameObject);
         }
     }
 }

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Cursors/BaseCursor.cs

@@ -316,6 +316,10 @@ protected virtual void UpdateCursorTransform()
                 {
                     Debug.LogError($"{name}: Unable to get focus details for {pointer.GetType().Name}!");
                 }
+                else if (pointer.GetType() != typeof(TouchPointer))
+                {
+                    Debug.LogWarning($"{pointer.GetType().Name} not registered!");
+                }
 
                 return;
             }

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/BaseControllerPointer.cs

@@ -61,6 +61,8 @@ public abstract class BaseControllerPointer : ControllerPoseSynchronizer, IMixed
 
         protected bool IsTeleportRequestActive = false;
 
+        private bool lateRegisterTeleport = false;
+
         /// <summary>
         /// The forward direction of the targeting ray
         /// </summary>
@@ -116,7 +118,33 @@ protected override void OnEnable()
             base.OnEnable();
             SetCursor();
             BaseCursor?.SetVisibility(true);
-            TeleportSystem?.Register(gameObject);
+
+            if (TeleportSystem == null)
+            {
+                lateRegisterTeleport = true;
+            }
+            else if (!lateRegisterTeleport)
+            {
+                TeleportSystem.Register(gameObject);
+            }
+        }
+
+        protected override void Start()
+        {
+            base.Start();
+
+            if (lateRegisterTeleport)
+            {
+                if (TeleportSystem == null)
+                {
+                    Debug.LogError("Failed to find the Teleport System!");
+                }
+                else
+                {
+                    lateRegisterTeleport = false;
+                    TeleportSystem.Register(gameObject);
+                }
+            }
         }
 
         protected override void OnDisable()

Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/MousePointer.cs

@@ -93,6 +93,25 @@ public override void OnPositionInputChanged(InputEventData<Vector2> eventData)
             }
         }
 
+        protected override void Start()
+        {
+            base.Start();
+
+            if (RayStabilizer != null)
+            {
+                RayStabilizer = null;
+            }
+
+            foreach (var inputSource in InputSystem.DetectedInputSources)
+            {
+                if (inputSource.SourceId == Controller.InputSource.SourceId)
+                {
+                    isInteractionEnabled = true;
+                    break;
+                }
+            }
+        }
+
         /// <inheritdoc />
         public override void OnSourceDetected(SourceStateEventData eventData)
         {
@@ -105,6 +124,7 @@ public override void OnSourceDetected(SourceStateEventData eventData)
 
             if (eventData.InputSource.SourceId == Controller.InputSource.SourceId)
             {
+                Debug.Log("Pointer detected");
                 isInteractionEnabled = true;
             }
         }