Merge pull request #8753 from davidkline-ms/moveSceneSysScenes

Fix inaccessible scene system resources

Author: David Kline

Assets/MRTK/Core/Inspectors/Profiles/MixedRealitySceneSystemProfileInspector.cs

@@ -19,13 +19,16 @@ public class MixedRealitySceneSystemProfileInspector : BaseMixedRealityToolkitCo
         const float DragAreaOffset = 10;
         const float LightingSceneTypesLabelWidth = 45;
 
-        private static string managerSceneContent =
-            "The Manager scene is loaded first and remains loaded for the duration of the app. Only one Manager scene is ever loaded, and no scene operation will ever unload it.";
+        private const string defaultSceneContent =
+            "Default scene system resources were not found.\nIf using custom manager and lighting scenes, this message can be ignored.\nIf not, please see the documentation for more information";
 
-        private static string lightingSceneContent =
-            "The Lighting scene controls lighting settings such as ambient light, skybox and sun direction. A Lighting scene's content is restricted based on the types defined in your editor settings. A default lighting scene is loaded on initialization. Only one lighting scene will ever be loaded at a time.";
+        private const string managerSceneContent =
+            "The manager scene is loaded first and remains loaded for the duration of the app. Only one manager scene is ever loaded, and no scene operation will ever unload it.";
 
-        private static string contentSceneContent =
+        private const string lightingSceneContent =
+            "The lighting scene controls lighting settings such as ambient light, skybox and sun direction. A lighting scene's content is restricted based on the types defined in your editor settings. A default lighting scene is loaded on initialization. Only one lighting scene will ever be loaded at a time.";
+
+        private const string contentSceneContent =
             "Content scenes are everything else. You can load and unload any number of content scenes in any combination, and their content is unrestricted.";
 
         private static bool showEditorProperties = true;
@@ -98,6 +101,11 @@ public override void OnInspectorGUI()
 
             MixedRealitySceneSystemProfile profile = (MixedRealitySceneSystemProfile)target;
 
+            if (!FindDefaultResources())
+            {
+                EditorGUILayout.HelpBox(defaultSceneContent, MessageType.Info);
+            }
+
             RenderFoldout(ref showEditorProperties, "Editor Settings", () =>
             {
                 using (new EditorGUI.IndentLevelScope())
@@ -311,5 +319,24 @@ private void DrawContentSceneElement(Rect rect, int index, bool isActive, bool i
         {
             SceneInfoDrawer.DrawProperty(rect, contentScenes.GetArrayElementAtIndex(index), GUIContent.none, isActive, isFocused);
         }
+
+        private const string defaultManagerAssetGuid = "ae7bb08d297fb69408695d8de0962524";
+        private Object defaultManagerAsset = null;
+        private const string defaultLightingAssetGuid = "7e54e36c44f826c438c95da79f8de638";
+        private Object defaultLightingAsset = null;
+
+        private bool FindDefaultResources()
+        {
+            if ((defaultManagerAsset != null) &&
+                (defaultLightingAsset != null))
+            {
+                return true;
+            }
+
+            defaultManagerAsset = AssetDatabase.LoadAssetAtPath<SceneAsset>(AssetDatabase.GUIDToAssetPath(defaultManagerAssetGuid));
+            defaultLightingAsset = AssetDatabase.LoadAssetAtPath<SceneAsset>(AssetDatabase.GUIDToAssetPath(defaultLightingAssetGuid));
+
+            return ((defaultManagerAsset != null) && (defaultLightingAsset != null));
+        }
     }
 }

Assets/MRTK/Examples/Experimental/ExamplesHub/Profiles/MRTKExamplesHubSceneSystemProfile.asset

@@ -16,7 +16,7 @@ MonoBehaviour:
   useManagerScene: 0
   managerScene:
     Name: DefaultManagerScene
-    Path: Assets/MRTK/SDK/StandardAssets/Scenes/DefaultManagerScene.unity
+    Path: Assets/MRTK/SceneSystemResources/DefaultManagerScene.unity
     Included: 0
     BuildIndex: -1
     Tag: Untagged
@@ -25,7 +25,7 @@ MonoBehaviour:
   defaultLightingSceneIndex: 0
   lightingScenes:
   - Name: DefaultLightingScene
-    Path: Assets/MRTK/SDK/StandardAssets/Scenes/DefaultLightingScene.unity
+    Path: Assets/MRTK/SceneSystemResources/DefaultLightingScene.unity
     Included: 0
     BuildIndex: -1
     Tag: Untagged

Assets/MRTK/SDK/Profiles/DefaultMixedRealitySceneSystemProfile.asset

@@ -16,7 +16,7 @@ MonoBehaviour:
   useManagerScene: 1
   managerScene:
     Name: DefaultManagerScene
-    Path: Assets/MRTK/SDK/StandardAssets/Scenes/DefaultManagerScene.unity
+    Path: Assets/MRTK/SceneSystemResources/DefaultManagerScene.unity
     Included: 0
     BuildIndex: -1
     Tag: Untagged
@@ -25,7 +25,7 @@ MonoBehaviour:
   defaultLightingSceneIndex: 0
   lightingScenes:
   - Name: DefaultLightingScene
-    Path: Assets/MRTK/SDK/StandardAssets/Scenes/DefaultLightingScene.unity
+    Path: Assets/MRTK/SceneSystemResources/DefaultLightingScene.unity
     Included: 0
     BuildIndex: -1
     Tag: Untagged

…sets/MRTK/SDK/StandardAssets/Scenes.meta Assets/MRTK/SceneSystemResources.metaAssets/MRTK/SDK/StandardAssets/Scenes.meta renamed to Assets/MRTK/SceneSystemResources.meta Assets/MRTK/SDK/StandardAssets/Scenes.meta renamed to Assets/MRTK/SceneSystemResources.meta

@@ -31,6 +31,8 @@
         "Providers*",
         "SDK*",
         "Services*",
-        "package.json.meta"
-    ]
+        "package.json.meta",
+        "Samples~"
+    ],
+    %samples%
 }