Merge pull request #4119 from wiwei/rc1pullinto

Merge pull request #3890 from Railboy/mrtk_camera_cache_fix

Author: wiwei

Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealityToolkitConfigurationProfileInspector.cs

@@ -285,4 +285,4 @@ public override void OnInspectorGUI()
             }
         }
     }
-}
+}

Assets/MixedRealityToolkit/Inspectors/Utilities/MixedRealityInspectorUtility.cs

@@ -35,11 +35,10 @@ public static bool CheckMixedRealityConfigured(bool showHelpBox = true)
                     {
                         EditorGUILayout.HelpBox("No Mixed Reality Toolkit found in scene.", MessageType.Error);
                     }
-
-                    return false;
                 }
 
-                MixedRealityToolkit.ConfirmInitialized();
+                // Don't proceeed
+                return false;
             }
 
             if (!MixedRealityToolkit.Instance.HasActiveProfile)

Assets/MixedRealityToolkit/Services/MixedRealityToolkit.cs

@@ -485,6 +485,11 @@ private void InitializeServiceLocator()
 
         private void EnsureMixedRealityRequirements()
         {
+            if (MixedRealityPlayspace == null)
+            {
+                Debug.LogError("Failed to generate a MixedRealityPlayspace.");
+            }
+
             // There's lots of documented cases that if the camera doesn't start at 0,0,0, things break with the WMR SDK specifically.
             // We'll enforce that here, then tracking can update it to the appropriate position later.
             CameraCache.Main.transform.position = Vector3.zero;

Assets/MixedRealityToolkit/Utilities/CameraCache.cs

@@ -20,57 +20,25 @@ public static Camera Main
         {
             get
             {
-                var mainCamera = cachedCamera == null ? Refresh(Camera.main) : cachedCamera;
-
-                if (mainCamera == null)
+                if (cachedCamera != null)
                 {
-                    // No camera in the scene tagged as main. Let's search the scene for a GameObject named Main Camera
-                    var cameras = Object.FindObjectsOfType<Camera>();
-
-                    switch (cameras.Length)
-                    {
-                        case 0:
-                            return null;
-                        case 1:
-                            mainCamera = Refresh(cameras[0]);
-                            break;
-                        default:
-                            // Search for main camera by name.
-                            for (int i = 0; i < cameras.Length; i++)
-                            {
-                                if (cameras[i].name == "Main Camera")
-                                {
-                                    mainCamera = Refresh(cameras[i]);
-                                    break;
-                                }
-                            }
+                    return cachedCamera;
+                }
 
-                            // If we still didn't find it, just set the first camera.
-                            if (mainCamera == null)
-                            {
-                                Debug.LogWarning($"No main camera found. The Mixed Reality Toolkit used {cameras[0].name} as your main.");
-                                mainCamera = Refresh(cameras[0]);
-                            }
+                // If the cached camera is null, search for main
+                var mainCamera = Camera.main;
 
-                            break;
-                    }
+                if (mainCamera == null)
+                {   // If no main camera was found, create it now
+                    Debug.LogWarning("No main camera found. The Mixed Reality Toolkit requires at least one camera in the scene. One will be generated now.");
+                    mainCamera = new GameObject("Main Camera", typeof(Camera)) { tag = "MainCamera" }.GetComponent<Camera>();
                 }
 
-                return mainCamera;
-            }
-        }
+                // Cache the main camera
+                cachedCamera = mainCamera;
 
-        /// <summary>
-        /// Set the cached camera to a new reference and return it
-        /// </summary>
-        /// <param name="newMain">New main camera to cache</param>
-        public static Camera Refresh(Camera newMain)
-        {
-            if (newMain == null)
-            {
-                Debug.LogWarning("A null camera was passed into CameraCache.Refresh()");
+                return cachedCamera;
             }
-            return cachedCamera = newMain;
         }
     }
 }