Fixed a few things with the new camera rig

XRTK-Core/Packages/com.xrtk.core/Providers/Controllers/BaseController.cs

@@ -259,7 +259,7 @@ internal async Task TryRenderControllerModelAsync(Type controllerType, byte[] gl
                 if (useSystemDefaultModels && gltfObject != null)
                 {
                     controllerModel.name = $"{controllerType.Name}_Visualization";
-                    controllerModel.transform.SetParent(MixedRealityToolkit.CameraSystem.CameraRig.BodyTransform);
+                    controllerModel.transform.SetParent(MixedRealityToolkit.CameraSystem.CameraRig.PlayspaceTransform);
                     var visualizationType = visualizationProfile.GetControllerVisualizationTypeOverride(controllerType, ControllerHandedness) ??
                                             visualizationProfile.ControllerVisualizationType;
                     controllerModel.AddComponent(visualizationType.Type);
@@ -268,7 +268,7 @@ internal async Task TryRenderControllerModelAsync(Type controllerType, byte[] gl
                 //If the model was a prefab
                 else
                 {
-                    var controllerObject = UnityEngine.Object.Instantiate(controllerModel, MixedRealityToolkit.CameraSystem.CameraRig.BodyTransform);
+                    var controllerObject = UnityEngine.Object.Instantiate(controllerModel, MixedRealityToolkit.CameraSystem.CameraRig.PlayspaceTransform);
                     controllerObject.name = $"{controllerType.Name}_Visualization";
                     Visualizer = controllerObject.GetComponent<IMixedRealityControllerVisualizer>();
                 }

XRTK-Core/Packages/com.xrtk.core/Providers/Controllers/BaseControllerDataProvider.cs

@@ -50,7 +50,7 @@ protected virtual IMixedRealityPointer[] RequestPointers(SystemType controllerTy
                     if (((useSpecificType && pointerProfile.ControllerType.Type == controllerType.Type) || (!useSpecificType && pointerProfile.ControllerType.Type == null)) &&
                         (pointerProfile.Handedness == Handedness.Any || pointerProfile.Handedness == Handedness.Both || pointerProfile.Handedness == controllingHand))
                     {
-                        var pointerObject = Object.Instantiate(pointerProfile.PointerPrefab, MixedRealityToolkit.CameraSystem.CameraRig.BodyTransform);
+                        var pointerObject = Object.Instantiate(pointerProfile.PointerPrefab, MixedRealityToolkit.CameraSystem.CameraRig.PlayspaceTransform);
                         var pointer = pointerObject.GetComponent<IMixedRealityPointer>();
 
                         if (pointer != null)

XRTK-Core/Packages/com.xrtk.core/Services/CameraSystem/DefaultCameraRig.cs

@@ -33,6 +33,11 @@ public Transform PlayspaceTransform
                     return playspaceTransform;
                 }
 
+                if (MixedRealityToolkit.IsApplicationQuitting)
+                {
+                    return null;
+                }
+
                 var playspaceTransformLookup = GameObject.Find(playspaceName);
 
                 playspaceTransform = playspaceTransformLookup == null
@@ -60,7 +65,7 @@ public Transform PlayspaceTransform
         }
 
         /// <inheritdoc />
-        public Transform CameraTransform => PlayerCamera.transform;
+        public Transform CameraTransform => PlayerCamera == null ? null : playerCamera.transform;
 
         [SerializeField]
         private Camera playerCamera = null;
@@ -75,6 +80,11 @@ public Camera PlayerCamera
                     return playerCamera;
                 }
 
+                if (MixedRealityToolkit.IsApplicationQuitting)
+                {
+                    return null;
+                }
+
                 // Currently the XRTK only supports a single player/user
                 // So for now we will always reference the tagged MainCamera.
                 if (playerCamera == null)
@@ -122,6 +132,11 @@ public TrackedPoseDriver CameraPoseDriver
                     return cameraPoseDriver;
                 }
 
+                if (MixedRealityToolkit.IsApplicationQuitting)
+                {
+                    return null;
+                }
+
                 cameraPoseDriver = PlayerCamera.gameObject.EnsureComponent<TrackedPoseDriver>();
                 cameraPoseDriver.UseRelativeTransform = true;
                 return cameraPoseDriver;
@@ -139,6 +154,16 @@ public Transform BodyTransform
         {
             get
             {
+                if (bodyTransform != null)
+                {
+                    return bodyTransform;
+                }
+
+                if (MixedRealityToolkit.IsApplicationQuitting)
+                {
+                    return null;
+                }
+
                 if (bodyTransform == null)
                 {
                     bodyTransform = PlayspaceTransform.Find(playerBodyName);

XRTK-Core/Packages/com.xrtk.core/Services/CameraSystem/MixedRealityCameraSystem.cs

@@ -70,9 +70,8 @@ public float HeadHeight
 
                 headHeight = value;
                 CameraRig.CameraPoseDriver.originPose = new Pose(new Vector3(0f, headHeight, 0f), Quaternion.identity);
-                var bodyLocalPosition = CameraRig.BodyTransform.localPosition;
-                bodyLocalPosition.y = headHeight;
-                CameraRig.BodyTransform.localPosition = bodyLocalPosition;
+
+                SyncRigTransforms();
             }
         }
 
@@ -159,9 +158,7 @@ public override void LateUpdate()
 
             if (!CameraRig.BodyTransform.localPosition.y.Equals(headHeight))
             {
-                var cameraPosition = CameraRig.BodyTransform.localPosition;
-                cameraPosition.y = headHeight;
-                CameraRig.BodyTransform.localPosition = cameraPosition;
+                SyncRigTransforms();
             }
         }
 
@@ -170,13 +167,15 @@ public override void Disable()
         {
             base.Disable();
 
-            if (CameraRig == null) { return; }
+            var camera = CameraCache.Main;
 
-            if (CameraRig.CameraTransform != null)
+            if (camera != null)
             {
-                CameraRig.CameraTransform.SetParent(null);
+                camera.transform.SetParent(null);
             }
 
+            if (CameraRig == null) { return; }
+
             if (CameraRig.PlayspaceTransform != null)
             {
                 if (Application.isPlaying)
@@ -189,7 +188,8 @@ public override void Disable()
                 }
             }
 
-            if (CameraRig is Component component)
+            if (CameraRig is Component component &&
+                component is IMixedRealityCameraRig)
             {
                 if (Application.isPlaying)
                 {
@@ -223,5 +223,18 @@ private void ApplySettingsForTransparentDisplay()
             CameraCache.Main.nearClipPlane = profile.NearClipPlaneTransparentDisplay;
             QualitySettings.SetQualityLevel(profile.TransparentQualityLevel, false);
         }
+
+        private void SyncRigTransforms()
+        {
+            // Sync the body position to be the correct height offset.
+            var bodyLocalPosition = CameraRig.BodyTransform.localPosition;
+            bodyLocalPosition.y = headHeight;
+            CameraRig.BodyTransform.localPosition = bodyLocalPosition;
+
+            // Offset the playspace by the amount we've applied to the head height.
+            var playspacePosition = CameraRig.PlayspaceTransform.position;
+            playspacePosition.y -= headHeight;
+            CameraRig.PlayspaceTransform.position = playspacePosition;
+        }
     }
 }

XRTK-Core/Packages/com.xrtk.core/Services/DiagnosticsSystem/MixedRealityDiagnosticsSystem.cs

@@ -234,7 +234,7 @@ public float WindowFollowSpeed
         private void CreateVisualizations()
         {
             diagnosticVisualizationParent = new GameObject("Diagnostics");
-            diagnosticVisualizationParent.transform.parent = MixedRealityToolkit.CameraSystem.CameraRig.BodyTransform;
+            diagnosticVisualizationParent.transform.parent = MixedRealityToolkit.CameraSystem.CameraRig.PlayspaceTransform;
             diagnosticVisualizationParent.SetActive(ShowDiagnostics);
 
             // visual profiler settings

XRTK-Core/Packages/com.xrtk.core/Services/SpatialAwarenessSystem/MixedRealitySpatialAwarenessSystem.cs

@@ -45,7 +45,7 @@ private GameObject CreateSpatialAwarenessParent
             get
             {
                 var spatialAwarenessSystemObject = new GameObject("Spatial Awareness System");
-                spatialAwarenessSystemObject.transform.parent = MixedRealityToolkit.CameraSystem.CameraRig.BodyTransform;
+                spatialAwarenessSystemObject.transform.parent = MixedRealityToolkit.CameraSystem.CameraRig.PlayspaceTransform;
                 return spatialAwarenessSystemObject;
             }
         }

XRTK-Core/Packages/com.xrtk.core/Utilities/CameraCache.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
+using XRTK.Services;
 
 namespace XRTK.Utilities
 {
@@ -24,6 +25,11 @@ public static Camera Main
 
                 if (mainCamera == null)
                 {
+                    if (MixedRealityToolkit.IsApplicationQuitting)
+                    {
+                        return null;
+                    }
+
                     mainCamera = new GameObject("Main Camera", typeof(Camera), typeof(AudioListener)) { tag = "MainCamera" }.GetComponent<Camera>();
                 }