Merge pull request #2794 from StephenHodgson/vNEXT-PointerFix

Fixed pointer registration.

Author: StephenHodgson

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

@@ -18,8 +18,6 @@ public class BaseCursor : InputSystemGlobalListener, IMixedRealityCursor
     {
         public CursorStateEnum CursorState { get; private set; } = CursorStateEnum.None;
 
-        public bool SetVisibilityOnSourceDetected { get; set; } = false;
-
         /// <summary>
         /// Surface distance to place the cursor off of the surface at
         /// </summary>
@@ -111,6 +109,9 @@ public virtual void SetVisibility(bool visible)
             }
         }
 
+        /// <inheritdoc />
+        public bool SetVisibilityOnSourceDetected { get; set; } = false;
+
         /// <inheritdoc />
         public GameObject GameObjectReference => gameObject;
 

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

@@ -11,9 +11,9 @@
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.Physics;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.TeleportSystem;
 using Microsoft.MixedReality.Toolkit.Core.Managers;
+using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;
 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
@@ -129,7 +129,6 @@ public virtual void SetCursor(GameObject newCursor = null)
         protected override void OnEnable()
         {
             base.OnEnable();
-            SetCursor();
 
             if (MixedRealityManager.IsInitialized && TeleportSystem != null && !lateRegisterTeleport)
             {
@@ -147,6 +146,12 @@ protected override async void Start()
                 lateRegisterTeleport = false;
                 TeleportSystem.Register(gameObject);
             }
+
+            if (InputSystem == null)
+            {
+                await WaitUntilInputSystemValid;
+                SetCursor();
+            }
         }
 
         protected override void OnDisable()

Assets/MixedRealityToolkit/_Core/Interfaces/InputSystem/IMixedRealityCursor.cs

@@ -42,6 +42,9 @@ public interface IMixedRealityCursor : IMixedRealityFocusChangedHandler, IMixedR
         /// <param name="visible">True if cursor should be visible, false if not.</param>
         void SetVisibility(bool visible);
 
+        /// <summary>
+        /// Sets the visibility of the <see cref="IMixedRealityCursor"/> when the source is detected.
+        /// </summary>
         bool SetVisibilityOnSourceDetected { get; set; }
 
         /// <summary>