Merge pull request #2387 from StephenHodgson/vNEXT-ControllerFixes

Fixed errors when stopping editor playmode.

Author: StephenHodgson

Assets/MixedRealityToolkit/InputSystem/Focus/FocusProvider.cs

@@ -390,6 +390,8 @@ public uint GenerateNewPointerId()
         /// <returns>The UIRaycastCamera</returns>
         private void CreateUiRaycastCamera()
         {
+            if (!enabled) { return; }
+
             var cameraObject = new GameObject { name = "UIRaycastCamera" };
             cameraObject.transform.parent = transform;
             cameraObject.transform.localPosition = Vector3.zero;

Assets/MixedRealityToolkit/InputSystem/MixedRealityInputManager.cs

@@ -102,7 +102,6 @@ private void InitializeInternal()
             {
                 if (Application.isEditor)
                 {
-#if UNITY_EDITOR
                     bool addedComponents = false;
                     var eventSystems = UnityEngine.Object.FindObjectsOfType<EventSystem>();
                     var standaloneInputModules = UnityEngine.Object.FindObjectsOfType<StandaloneInputModule>();
@@ -121,6 +120,7 @@ private void InitializeInternal()
                         addedComponents = true;
                     }
 
+#if UNITY_EDITOR
                     if (addedComponents) { UnityEditor.EditorGUIUtility.PingObject(FocusProvider.UIRaycastCamera); }
 #endif
                 }
@@ -166,22 +166,22 @@ public override void Destroy()
         {
             InputDisabled?.Invoke();
 
-            if (FocusProvider.UIRaycastCamera != null)
-            {
-                if (Application.isEditor)
-                {
-                    UnityEngine.Object.DestroyImmediate(FocusProvider.UIRaycastCamera.gameObject);
-                }
-                else
-                {
-                    UnityEngine.Object.Destroy(FocusProvider.UIRaycastCamera.gameObject);
-                }
-            }
-
             if (focusProvider != null)
             {
                 focusProvider.enabled = false;
 
+                if (FocusProvider.UIRaycastCamera != null)
+                {
+                    if (Application.isEditor)
+                    {
+                        UnityEngine.Object.DestroyImmediate(FocusProvider.UIRaycastCamera.gameObject);
+                    }
+                    else
+                    {
+                        UnityEngine.Object.Destroy(FocusProvider.UIRaycastCamera.gameObject);
+                    }
+                }
+
                 if (Application.isEditor)
                 {
                     UnityEngine.Object.DestroyImmediate(focusProvider);

Assets/MixedRealityToolkit/_Core/Devices/MixedReality/WindowsMixedRealityDeviceManager.cs

@@ -82,14 +82,19 @@ public override IMixedRealityController[] GetActiveControllers()
         /// </summary>
         /// <param name="interactionSourceState">Source State provided by the SDK</param>
         /// <returns>New or Existing Controller Input Source</returns>
-        private WindowsMixedRealityController GetOrAddController(InteractionSourceState interactionSourceState)
+        private WindowsMixedRealityController GetOrAddController(InteractionSourceState interactionSourceState, bool updateControllerData = true)
         {
             //If a device is already registered with the ID provided, just return it.
             if (activeControllers.ContainsKey(interactionSourceState.source.id))
             {
                 var controller = activeControllers[interactionSourceState.source.id] as WindowsMixedRealityController;
                 Debug.Assert(controller != null);
-                controller.UpdateController(interactionSourceState);
+
+                if (updateControllerData)
+                {
+                    controller.UpdateController(interactionSourceState);
+                }
+
                 return controller;
             }
 
@@ -124,7 +129,7 @@ private WindowsMixedRealityController GetOrAddController(InteractionSourceState
         /// <param name="interactionSourceState">Source State provided by the SDK to remove</param>
         private void RemoveController(InteractionSourceState interactionSourceState)
         {
-            var controller = GetOrAddController(interactionSourceState);
+            var controller = GetOrAddController(interactionSourceState, false);
             InputSystem?.RaiseSourceLost(controller?.InputSource, controller);
             activeControllers.Remove(interactionSourceState.source.id);
         }