Change Requests

Author: StephenHodgson

Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scripts/BoundaryVisualizationDemo.cs

@@ -7,6 +7,7 @@
 using Microsoft.MixedReality.Toolkit.Core.Managers;
 using Microsoft.MixedReality.Toolkit.Core.Utilities;
 using System.Collections.Generic;
+using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;
 using UnityEngine;
 using UnityEngine.Experimental.XR;
 
@@ -68,14 +69,15 @@ private void Update()
             }
         }
 
-        private void OnEnable()
+        private async void OnEnable()
         {
+            await new WaitUntil(() => MixedRealityManager.BoundarySystem != null);
             MixedRealityManager.BoundarySystem.Register(gameObject);
         }
 
         private void OnDisable()
         {
-            MixedRealityManager.BoundarySystem.Unregister(gameObject);
+            MixedRealityManager.BoundarySystem?.Unregister(gameObject);
         }
 
         #endregion MonoBehaviour Implementation

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

@@ -7,6 +7,7 @@
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
 using Microsoft.MixedReality.Toolkit.Core.Managers;
 using Microsoft.MixedReality.Toolkit.Core.Utilities;
+using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;
 using Microsoft.MixedReality.Toolkit.Core.Utilities.Physics;
 using System;
 using System.Collections.Generic;
@@ -224,7 +225,7 @@ public override int GetHashCode()
 
         #region MonoBehaviour Implementation
 
-        private void Awake()
+        private async void Awake()
         {
             if (uiRaycastCamera == null)
             {
@@ -233,6 +234,8 @@ private void Awake()
                 CreateUiRaycastCamera();
             }
 
+            await WaitUntilInputSystemValid;
+
             foreach (var inputSource in MixedRealityManager.InputSystem.DetectedInputSources)
             {
                 RegisterPointers(inputSource);
@@ -241,6 +244,8 @@ private void Awake()
 
         private void Update()
         {
+            if (MixedRealityManager.InputSystem == null) { return; }
+
             UpdatePointers();
             UpdateFocusedObjects();
         }

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

@@ -30,8 +30,8 @@ public override void OnBeforeFocusChange(FocusEventData eventData)
 
                 if (eventData.Pointer.IsInteractionEnabled)
                 {
-                    MixedRealityManager.TeleportSystem.RaiseTeleportCanceled(eventData.Pointer, this);
-                    MixedRealityManager.TeleportSystem.RaiseTeleportRequest(eventData.Pointer, this);
+                    MixedRealityManager.TeleportSystem?.RaiseTeleportCanceled(eventData.Pointer, this);
+                    MixedRealityManager.TeleportSystem?.RaiseTeleportRequest(eventData.Pointer, this);
                 }
             }
             else if (eventData.OldFocusedObject == gameObject)
@@ -40,7 +40,7 @@ public override void OnBeforeFocusChange(FocusEventData eventData)
 
                 if (eventData.Pointer.IsInteractionEnabled)
                 {
-                    MixedRealityManager.TeleportSystem.RaiseTeleportCanceled(eventData.Pointer, this);
+                    MixedRealityManager.TeleportSystem?.RaiseTeleportCanceled(eventData.Pointer, this);
                 }
             }
         }

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

@@ -165,7 +165,7 @@ public Vector3 GetModifiedPosition(IMixedRealityCursor cursor)
             }
 
             FocusDetails focusDetails;
-            if (MixedRealityManager.InputSystem.FocusProvider.TryGetFocusDetails(cursor.Pointer, out focusDetails))
+            if (MixedRealityManager.InputSystem != null && MixedRealityManager.InputSystem.FocusProvider.TryGetFocusDetails(cursor.Pointer, out focusDetails))
             {
                 // Else, consider the modifiers on the cursor modifier, but don't snap
                 return focusDetails.Point + HostTransform.TransformVector(CursorPositionOffset);