Removed Scene Launcher Checker and added SceneLauncher.prefab back into the scene.

Updated default Editor Build Settings to include the adjustment scene and scene loader scenes by default.

Author: Stephen Hodgson

Assets/HoloToolkit/Utilities/Prefabs/SceneLauncher.prefab

@@ -263,7 +263,7 @@ MonoBehaviour:
   PersistentKeywords: 1
   RecognizerStart: 0
   Keywords:
-  - Keyword: Scene Loader
+  - Keyword: Scene Launcher
     KeyCode: 8
 --- !u!114 &114669922776097872
 MonoBehaviour:
@@ -277,6 +277,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   sceneMapping:
+  - ScenePath: Assets/HoloToolkit/Utilities/Scenes/HeadsetAdjustment.unity
+    IsButtonEnabled: 1
   - ScenePath: Assets/HoloToolkit/Utilities/Scenes/SceneLauncher.unity
     IsButtonEnabled: 1
   ButtonSpawnLocation: {fileID: 1899756416056624}

Assets/HoloToolkit/Utilities/Scenes/SceneLauncher.unity

@@ -42,7 +42,7 @@ RenderSettings:
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 11
   m_GIWorkflowMode: 0
   m_GISettings:
     serializedVersion: 2
@@ -54,7 +54,7 @@ LightmapSettings:
     m_EnableBakedLightmaps: 1
     m_EnableRealtimeLightmaps: 1
   m_LightmapEditorSettings:
-    serializedVersion: 8
+    serializedVersion: 9
     m_Resolution: 2
     m_BakeResolution: 40
     m_TextureWidth: 1024
@@ -87,7 +87,7 @@ LightmapSettings:
     m_PVRFilteringAtrousNormalSigma: 1
     m_PVRFilteringAtrousPositionSigma: 1
   m_LightingDataAsset: {fileID: 0}
-  m_ShadowMaskMode: 2
+  m_UseShadowmask: 1
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -108,48 +108,6 @@ NavMeshSettings:
     tileSize: 256
     accuratePlacement: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &216353462
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 216353463}
-  - component: {fileID: 216353464}
-  m_Layer: 0
-  m_Name: SceneLauncherChecker
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &216353463
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 216353462}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &216353464
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 216353462}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bd26dc5d91faced46b5d686df88b9a5c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  sceneLauncherPrefab: {fileID: 1247193059148626, guid: a3f14aa6417acfa4ea1c4feb6af974ab,
-    type: 2}
 --- !u!1001 &348833248
 Prefab:
   m_ObjectHideFlags: 0
@@ -192,6 +150,48 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: a611e772ef8ddf64d8106a9cbb70f31c, type: 2}
   m_IsPrefabParent: 0
+--- !u!1001 &1083084514
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4856770467070142, guid: a3f14aa6417acfa4ea1c4feb6af974ab, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4856770467070142, guid: a3f14aa6417acfa4ea1c4feb6af974ab, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4856770467070142, guid: a3f14aa6417acfa4ea1c4feb6af974ab, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4856770467070142, guid: a3f14aa6417acfa4ea1c4feb6af974ab, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4856770467070142, guid: a3f14aa6417acfa4ea1c4feb6af974ab, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4856770467070142, guid: a3f14aa6417acfa4ea1c4feb6af974ab, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4856770467070142, guid: a3f14aa6417acfa4ea1c4feb6af974ab, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4856770467070142, guid: a3f14aa6417acfa4ea1c4feb6af974ab, type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: a3f14aa6417acfa4ea1c4feb6af974ab, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1001 &1541373690
 Prefab:
   m_ObjectHideFlags: 0

Assets/HoloToolkit/Utilities/Scripts/SceneLauncher.cs

@@ -7,7 +7,7 @@
 
 namespace HoloToolkit.Unity
 {
-    public class SceneLauncher : MonoBehaviour
+    public class SceneLauncher : Singleton<SceneLauncher>
     {
         [Serializable]
         private class SceneMapping
@@ -19,7 +19,7 @@ private class SceneMapping
         }
 
         [SerializeField]
-        [Tooltip("The button scene mapping to keep track of which scenes are enabled in the scene launcher.  This list of scenes is generated from the build window active scenes.")]
+        [Tooltip("The button scene mapping to keep track of which scenes are enabled in the scene launcher.  This list of scenes is generated from the build window's active scenes.")]
         private SceneMapping[] sceneMapping;
 
         [Tooltip("Location of the center of the grid of buttons in Unity space.")]
@@ -39,6 +39,20 @@ private void OnValidate()
             Debug.Assert(SceneButtonPrefab != null, "SceneLauncher.SceneButtonPrefab is not set.");
         }
 
+        protected override void Awake()
+        {
+            // If we have already initialized,
+            // then we've created a second one.
+            if (IsInitialized)
+            {
+                Destroy(gameObject);
+            }
+            else
+            {
+                base.Awake();
+            }
+        }
+
         private void Start()
         {
             if (SceneButtonPrefab == null)
@@ -49,7 +63,7 @@ private void Start()
             SceneLauncherBuildIndex = SceneManager.GetActiveScene().buildIndex;
 
             // Determine the size of the buttons. Instantiate one of them so that we can check its bounds.
-            SceneLauncherButton sceneButtonForSize = Instantiate(SceneButtonPrefab);
+            var sceneButtonForSize = Instantiate(SceneButtonPrefab);
             var sceneButtonForSizeCollider = sceneButtonForSize.GetComponent<Collider>();
 
             if (sceneButtonForSizeCollider != null)
@@ -73,10 +87,10 @@ private void CreateSceneButton(GameObject buttonParent, int sceneIndex)
             string sceneName = sceneMapping[sceneIndex].ScenePath;
             sceneName = sceneName.Substring(sceneName.LastIndexOf("/", StringComparison.Ordinal) + 1);
             sceneName = sceneName.Replace(".unity", "");
-            Scene scene = SceneManager.GetSceneByBuildIndex(sceneIndex);
+            var scene = SceneManager.GetSceneByBuildIndex(sceneIndex);
             Debug.Assert(SceneManager.GetSceneByName(sceneName) == scene);
 
-            SceneLauncherButton sceneButton = Instantiate(SceneButtonPrefab, GetButtonPosition(sceneIndex, sceneMapping.Length), Quaternion.identity, buttonParent.transform);
+            var sceneButton = Instantiate(SceneButtonPrefab, GetButtonPosition(sceneIndex, sceneMapping.Length), Quaternion.identity, buttonParent.transform);
             sceneButton.SceneIndex = sceneIndex;
             sceneButton.SceneName = sceneName;
             sceneButton.MenuReference = ButtonSpawnLocation;
@@ -92,10 +106,10 @@ private Vector3 GetButtonPosition(int sceneIndex, int numberOfScenes)
 
             // Center a grid of cells in a grid.
             // The top-left corner is shifted .5 cell widths for every row/column after the first one.
-            Vector3 topLeft = new Vector3((xCount - 1) * -0.5f, (yCount - 1) * 0.5f, 0.0f);
-            Vector3 cellFromTopLeft = new Vector3(x, -y, 0.0f);
+            var topLeft = new Vector3((xCount - 1) * -0.5f, (yCount - 1) * 0.5f, 0.0f);
+            var cellFromTopLeft = new Vector3(x, -y, 0.0f);
             // Scale by size of the button.
-            Vector3 positionOffset = Vector3.Scale(topLeft + cellFromTopLeft, new Vector3(sceneButtonSize.x, sceneButtonSize.y, 1.0f));
+            var positionOffset = Vector3.Scale(topLeft + cellFromTopLeft, new Vector3(sceneButtonSize.x, sceneButtonSize.y, 1.0f));
 
             return ButtonSpawnLocation.transform.position + positionOffset;
         }

Assets/HoloToolkit/Utilities/Scripts/SceneLauncherChecker.cs

@@ -4,4 +4,10 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/HoloToolkit/Utilities/Scenes/HeadsetAdjustment.unity
+    guid: 6328c96cc619a8b41a866766f9513e17
+  - enabled: 1
+    path: Assets/HoloToolkit/Utilities/Scenes/SceneLauncher.unity
+    guid: fd656d2febd0dea46b3825b704706806