Merge branch 'mrtk_development' into vNEXT-SpatialMouse

Author: StephenHodgson

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

@@ -316,10 +316,6 @@ 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

@@ -13,6 +13,7 @@
 using Microsoft.MixedReality.Toolkit.Core.Managers;
 using Microsoft.MixedReality.Toolkit.SDK.Input.Handlers;
 using System.Collections;
+using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.SDK.UX.Pointers
@@ -61,7 +62,7 @@ public abstract class BaseControllerPointer : ControllerPoseSynchronizer, IMixed
 
         protected bool IsTeleportRequestActive = false;
 
-        private bool lateRegisterTeleport = false;
+        private bool lateRegisterTeleport = true;
 
         /// <summary>
         /// The forward direction of the targeting ray
@@ -119,31 +120,21 @@ protected override void OnEnable()
             SetCursor();
             BaseCursor?.SetVisibility(true);
 
-            if (TeleportSystem == null)
-            {
-                lateRegisterTeleport = true;
-            }
-            else if (!lateRegisterTeleport)
+            if (MixedRealityManager.IsInitialized && TeleportSystem != null && !lateRegisterTeleport)
             {
                 TeleportSystem.Register(gameObject);
             }
         }
 
-        protected override void Start()
+        protected override async void Start()
         {
             base.Start();
 
             if (lateRegisterTeleport)
             {
-                if (TeleportSystem == null)
-                {
-                    Debug.LogError("Failed to find the Teleport System!");
-                }
-                else
-                {
-                    lateRegisterTeleport = false;
-                    TeleportSystem.Register(gameObject);
-                }
+                await new WaitUntil(() => TeleportSystem != null);
+                lateRegisterTeleport = false;
+                TeleportSystem.Register(gameObject);
             }
         }
 

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

@@ -290,7 +290,7 @@ public override void OnPositionInputChanged(InputEventData<Vector2> eventData)
                     {
                         teleportEnabled = true;
 
-                        TeleportSystem.RaiseTeleportRequest(this, TeleportHotSpot);
+                        TeleportSystem?.RaiseTeleportRequest(this, TeleportHotSpot);
                     }
                     else if (canMove)
                     {
@@ -356,15 +356,15 @@ public override void OnPositionInputChanged(InputEventData<Vector2> eventData)
                     if (TeleportSurfaceResult == TeleportSurfaceResult.Valid ||
                         TeleportSurfaceResult == TeleportSurfaceResult.HotSpot)
                     {
-                        TeleportSystem.RaiseTeleportStarted(this, TeleportHotSpot);
+                        TeleportSystem?.RaiseTeleportStarted(this, TeleportHotSpot);
                     }
                 }
 
                 if (teleportEnabled)
                 {
                     canTeleport = false;
                     teleportEnabled = false;
-                    TeleportSystem.RaiseTeleportCanceled(this, TeleportHotSpot);
+                    TeleportSystem?.RaiseTeleportCanceled(this, TeleportHotSpot);
                 }
             }