body2Playspace: making the mixed reality manager initialize playspace

Ecnassianer · Ecnassianer · commit 1e237cfe55a6 · 2018-09-12T14:56:01.000-07:00
replaced all instances of getting Camera's parent with playspace parm
diff --git a/Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scripts/BoundaryVisualizationDemo.cs b/Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scripts/BoundaryVisualizationDemo.cs
@@ -44,7 +44,7 @@ private void Awake()
         {
             markerParent = new GameObject();
             markerParent.name = "Boundary Demo Markers";
-            markerParent.transform.parent = CameraCache.Main.transform.parent;
+            markerParent.transform.parent = MixedRealityManager.Instance.MixedRealityPlayspace.transform;
         }
 
         private void Start()
diff --git a/Assets/MixedRealityToolkit-SDK/Features/Boundary/MixedRealityBoundaryManager.cs b/Assets/MixedRealityToolkit-SDK/Features/Boundary/MixedRealityBoundaryManager.cs
@@ -189,7 +189,7 @@ public override void Destroy()
         private GameObject CreateBoundaryVisualizationParent()
         {
             GameObject visualizationParent = new GameObject("Boundary System Visualizations");
-            visualizationParent.transform.parent = CameraCache.Main.transform.parent;
+            visualizationParent.transform.parent = MixedRealityManager.Instance.MixedRealityPlayspace.transform;
 
             return visualizationParent;
         }
@@ -456,7 +456,7 @@ public bool Contains(Vector3 location, Boundary.Type boundaryType = Boundary.Typ
             }
 
             // Handle the user teleporting (boundary moves with them).
-            location = CameraCache.Main.transform.parent.InverseTransformPoint(location);
+            location = MixedRealityManager.Instance.MixedRealityPlayspace.transform.InverseTransformPoint(location);
 
             if (FloorHeight.Value > location.y ||
                 BoundaryHeight < location.y)
@@ -499,7 +499,7 @@ public bool TryGetRectangularBoundsParams(out Vector2 center, out float angle, o
             }
 
             // Handle the user teleporting (boundary moves with them).
-            Vector3 transformedCenter = CameraCache.Main.transform.parent.TransformPoint(
+            Vector3 transformedCenter = MixedRealityManager.Instance.MixedRealityPlayspace.transform.TransformPoint(
                 new Vector3(rectangularBounds.Center.x, 0f, rectangularBounds.Center.y));
 
             center = new Vector2(transformedCenter.x, transformedCenter.z);
@@ -530,9 +530,9 @@ public GameObject GetFloorVisualization()
             currentFloorObject.name = "Boundary System Floor";
             currentFloorObject.transform.localScale = new Vector3(floorScale.x, boundaryObjectThickness, floorScale.y);
             currentFloorObject.transform.Translate(new Vector3(
-                CameraCache.Main.transform.parent.position.x, 
+                MixedRealityManager.Instance.MixedRealityPlayspace.transform.position.x, 
                 FloorHeight.Value - (currentFloorObject.transform.localScale.y * 0.5f), 
-                CameraCache.Main.transform.parent.position.z));
+                MixedRealityManager.Instance.MixedRealityPlayspace.transform.position.z));
             currentFloorObject.GetComponent<Renderer>().sharedMaterial = MixedRealityManager.Instance.ActiveProfile.BoundaryVisualizationProfile.FloorMaterial;
 
             return currentFloorObject;
@@ -606,9 +606,9 @@ public GameObject GetTrackedAreaVisualization()
             currentTrackedAreaObject.layer = ignoreRaycastLayerValue;
             currentTrackedAreaObject.AddComponent<LineRenderer>();
             currentTrackedAreaObject.transform.Translate(new Vector3(
-                CameraCache.Main.transform.parent.position.x,
+                MixedRealityManager.Instance.MixedRealityPlayspace.transform.position.x,
                 boundaryObjectRenderOffset,
-                CameraCache.Main.transform.parent.position.z));
+                MixedRealityManager.Instance.MixedRealityPlayspace.transform.position.z));
 
             // Configure the renderer properties.
             float lineWidth = 0.01f;
diff --git a/Assets/MixedRealityToolkit-SDK/Features/Input/MixedRealityInputManager.cs b/Assets/MixedRealityToolkit-SDK/Features/Input/MixedRealityInputManager.cs
@@ -91,12 +91,6 @@ public override void Initialize()
 
         private void InitializeInternal()
         {
-            if (CameraCache.Main.transform.parent == null)
-            {
-                var cameraParent = new GameObject("Body");
-                CameraCache.Main.transform.SetParent(cameraParent.transform);
-            }
-
             focusProvider = CameraCache.Main.gameObject.EnsureComponent<FocusProvider>();
             gazeProvider = CameraCache.Main.gameObject.EnsureComponent<GazeProvider>();
 
diff --git a/Assets/MixedRealityToolkit-SDK/Features/Teleportation/MixedRealityTeleportManager.cs b/Assets/MixedRealityToolkit-SDK/Features/Teleportation/MixedRealityTeleportManager.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Microsoft.MixedReality.Toolkit.Core.EventDatum.Teleport;
@@ -40,16 +40,6 @@ public override void Initialize()
 
         private void InitializeInternal()
         {
-            if (CameraCache.Main.transform.parent == null)
-            {
-                var cameraParent = new GameObject("Body");
-                CameraCache.Main.transform.SetParent(cameraParent.transform);
-            }
-
-            // Make sure the camera is at the scene origin.
-            CameraCache.Main.transform.parent.transform.position = Vector3.zero;
-            CameraCache.Main.transform.localPosition = Vector3.zero;
-
 #if UNITY_EDITOR
             if (!UnityEditor.EditorApplication.isPlaying)
             {
@@ -248,7 +238,7 @@ private void ProcessTeleportationRequest(TeleportEventData eventData)
         {
             isProcessingTeleportRequest = true;
 
-            var cameraParent = CameraCache.Main.transform.parent;
+            var cameraParent = MixedRealityManager.Instance.MixedRealityPlayspace.transform;
 
             targetRotation = Vector3.zero;
             targetRotation.y = eventData.Pointer.PointerOrientation;
diff --git a/Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs b/Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Pointers/TeleportPointer.cs
@@ -5,6 +5,7 @@
 using Microsoft.MixedReality.Toolkit.Core.Definitions.Physics;
 using Microsoft.MixedReality.Toolkit.Core.EventDatum.Input;
 using Microsoft.MixedReality.Toolkit.Core.EventDatum.Teleport;
+using Microsoft.MixedReality.Toolkit.Core.Managers;
 using Microsoft.MixedReality.Toolkit.Core.Utilities;
 using Microsoft.MixedReality.Toolkit.Core.Utilities.Physics;
 using System;
@@ -302,7 +303,7 @@ public override void OnPositionInputChanged(InputEventData<Vector2> eventData)
                             {
                                 canMove = false;
                                 // Rotate the camera by the rotation amount.  If our angle is positive then rotate in the positive direction, otherwise in the opposite direction.
-                                CameraCache.Main.transform.parent.RotateAround(CameraCache.Main.transform.position, Vector3.up, angle >= 0.0f ? rotationAmount : -rotationAmount);
+                                MixedRealityManager.Instance.MixedRealityPlayspace.transform.RotateAround(CameraCache.Main.transform.position, Vector3.up, angle >= 0.0f ? rotationAmount : -rotationAmount);
                             }
                             else // We may be trying to strafe backwards.
                             {
@@ -316,10 +317,10 @@ public override void OnPositionInputChanged(InputEventData<Vector2> eventData)
                                 if (offsetStrafeAngle > 0 && offsetStrafeAngle < backStrafeActivationAngle)
                                 {
                                     canMove = false;
-                                    var height = CameraCache.Main.transform.parent.position.y;
-                                    var newPosition = -CameraCache.Main.transform.forward * strafeAmount + CameraCache.Main.transform.parent.position;
+                                    var height = MixedRealityManager.Instance.MixedRealityPlayspace.transform.position.y;
+                                    var newPosition = -CameraCache.Main.transform.forward * strafeAmount + MixedRealityManager.Instance.MixedRealityPlayspace.transform.position;
                                     newPosition.y = height;
-                                    CameraCache.Main.transform.parent.position = newPosition;
+                                    MixedRealityManager.Instance.MixedRealityPlayspace.transform.position = newPosition;
                                 }
                             }
                         }
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/BaseController.cs b/Assets/MixedRealityToolkit/_Core/Devices/BaseController.cs
@@ -203,7 +203,7 @@ private void TryRenderControllerModel(Type controllerType)
             // If we've got a controller model prefab, then place it in the scene.
             if (controllerModel != null)
             {
-                var controllerObject = UnityEngine.Object.Instantiate(controllerModel, CameraCache.Main.transform.parent);
+                var controllerObject = UnityEngine.Object.Instantiate(controllerModel, MixedRealityManager.Instance.MixedRealityPlayspace.transform);
                 controllerObject.name = $"{ControllerHandedness}_{controllerObject.name}";
                 var poseSynchronizer = controllerObject.GetComponent<IMixedRealityControllerPoseSynchronizer>();
 
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/BaseDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/BaseDeviceManager.cs
@@ -99,7 +99,7 @@ protected virtual IMixedRealityPointer[] RequestPointers(SystemType controllerTy
                     {
                         var pointerObject = Object.Instantiate(pointerProfile.PointerPrefab);
                         var pointer = pointerObject.GetComponent<IMixedRealityPointer>();
-                        pointerObject.transform.SetParent(CameraCache.Main.transform.parent);
+                        pointerObject.transform.SetParent(MixedRealityManager.Instance.MixedRealityPlayspace.transform);
 
                         if (pointer != null)
                         {
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/MixedReality/WindowsMixedRealityController.cs b/Assets/MixedRealityToolkit/_Core/Devices/MixedReality/WindowsMixedRealityController.cs
@@ -243,10 +243,10 @@ private void UpdateGripData(InteractionSourceState interactionSourceState, Mixed
                         interactionSourceState.sourcePose.TryGetPosition(out currentGripPosition, InteractionSourceNode.Grip);
                         interactionSourceState.sourcePose.TryGetRotation(out currentGripRotation, InteractionSourceNode.Grip);
 
-                        if (CameraCache.Main.transform.parent != null)
+                        if (MixedRealityManager.Instance.MixedRealityPlayspace.transform != null)
                         {
-                            currentGripPose.Position = CameraCache.Main.transform.parent.TransformPoint(currentGripPosition);
-                            currentGripPose.Rotation = Quaternion.Euler(CameraCache.Main.transform.parent.TransformDirection(currentGripRotation.eulerAngles));
+                            currentGripPose.Position = MixedRealityManager.Instance.MixedRealityPlayspace.transform.TransformPoint(currentGripPosition);
+                            currentGripPose.Rotation = Quaternion.Euler(MixedRealityManager.Instance.MixedRealityPlayspace.transform.TransformDirection(currentGripRotation.eulerAngles));
                         }
                         else
                         {
diff --git a/Assets/MixedRealityToolkit/_Core/Managers/MixedRealityManager.cs b/Assets/MixedRealityToolkit/_Core/Managers/MixedRealityManager.cs
@@ -341,6 +341,36 @@ private void InitializeInternal()
             }
         }
 
+        private GameObject mixedRealityPlayspace;
+
+        /// <summary>
+        /// Returns the MixedRealityPlayspace for the local player
+        /// </summary>
+        public GameObject MixedRealityPlayspace
+        {
+            get {
+                AssertIsInitialized();
+                if (mixedRealityPlayspace)
+                {
+                    return mixedRealityPlayspace;
+                }
+                else
+                {
+                    mixedRealityPlayspace = new GameObject("MixedRealityPlayspace");
+                    CameraCache.Main.transform.SetParent(mixedRealityPlayspace.transform);
+
+                    // It's very important that the MixedRealityPlayspace align with the tracked space,
+                    // otherwise reality-locked things like playspace boundaries won't be aligned properly.
+                    // For now, we'll just assume that when the playspace is first initialized, the
+                    // tracked space origin overlaps with the world space origin. If a platform ever does
+                    // something else (i.e, placing the lower left hand corner of the tracked space at world 
+                    // space 0,0,0), we should compensate for that here.
+
+                    return mixedRealityPlayspace;
+                }
+            }
+        }
+
         private void ApplicationOnQuitting()
         {
             DisableAllManagers();

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ private void Awake()`
`44`	`44`	`{`
`45`	`45`	`markerParent = new GameObject();`
`46`	`46`	`markerParent.name = "Boundary Demo Markers";`
`47`		`- markerParent.transform.parent = CameraCache.Main.transform.parent;`
	`47`	`+ markerParent.transform.parent = MixedRealityManager.Instance.MixedRealityPlayspace.transform;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`private void Start()`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using Microsoft.MixedReality.Toolkit.Core.Definitions.Physics;`
`6`	`6`	`using Microsoft.MixedReality.Toolkit.Core.EventDatum.Input;`
`7`	`7`	`using Microsoft.MixedReality.Toolkit.Core.EventDatum.Teleport;`
	`8`	`+using Microsoft.MixedReality.Toolkit.Core.Managers;`
`8`	`9`	`using Microsoft.MixedReality.Toolkit.Core.Utilities;`
`9`	`10`	`using Microsoft.MixedReality.Toolkit.Core.Utilities.Physics;`
`10`	`11`	`using System;`
`@@ -302,7 +303,7 @@ public override void OnPositionInputChanged(InputEventData<Vector2> eventData)`
`302`	`303`	`{`
`303`	`304`	`canMove = false;`
`304`	`305`	`// Rotate the camera by the rotation amount. If our angle is positive then rotate in the positive direction, otherwise in the opposite direction.`
`305`		`- CameraCache.Main.transform.parent.RotateAround(CameraCache.Main.transform.position, Vector3.up, angle >= 0.0f ? rotationAmount : -rotationAmount);`
	`306`	`+ MixedRealityManager.Instance.MixedRealityPlayspace.transform.RotateAround(CameraCache.Main.transform.position, Vector3.up, angle >= 0.0f ? rotationAmount : -rotationAmount);`
`306`	`307`	`}`
`307`	`308`	`else // We may be trying to strafe backwards.`
`308`	`309`	`{`
`@@ -316,10 +317,10 @@ public override void OnPositionInputChanged(InputEventData<Vector2> eventData)`
`316`	`317`	`if (offsetStrafeAngle > 0 && offsetStrafeAngle < backStrafeActivationAngle)`
`317`	`318`	`{`
`318`	`319`	`canMove = false;`
`319`		`- var height = CameraCache.Main.transform.parent.position.y;`
`320`		`- var newPosition = -CameraCache.Main.transform.forward * strafeAmount + CameraCache.Main.transform.parent.position;`
	`320`	`+ var height = MixedRealityManager.Instance.MixedRealityPlayspace.transform.position.y;`
	`321`	`+ var newPosition = -CameraCache.Main.transform.forward * strafeAmount + MixedRealityManager.Instance.MixedRealityPlayspace.transform.position;`
`321`	`322`	`newPosition.y = height;`
`322`		`- CameraCache.Main.transform.parent.position = newPosition;`
	`323`	`+ MixedRealityManager.Instance.MixedRealityPlayspace.transform.position = newPosition;`
`323`	`324`	`}`
`324`	`325`	`}`
`325`	`326`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ private void TryRenderControllerModel(Type controllerType)`
`203`	`203`	`// If we've got a controller model prefab, then place it in the scene.`
`204`	`204`	`if (controllerModel != null)`
`205`	`205`	`{`
`206`		`- var controllerObject = UnityEngine.Object.Instantiate(controllerModel, CameraCache.Main.transform.parent);`
	`206`	`+ var controllerObject = UnityEngine.Object.Instantiate(controllerModel, MixedRealityManager.Instance.MixedRealityPlayspace.transform);`
`207`	`207`	`controllerObject.name = $"{ControllerHandedness}_{controllerObject.name}";`
`208`	`208`	`var poseSynchronizer = controllerObject.GetComponent<IMixedRealityControllerPoseSynchronizer>();`
`209`	`209`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ protected virtual IMixedRealityPointer[] RequestPointers(SystemType controllerTy`
`99`	`99`	`{`
`100`	`100`	`var pointerObject = Object.Instantiate(pointerProfile.PointerPrefab);`
`101`	`101`	`var pointer = pointerObject.GetComponent<IMixedRealityPointer>();`
`102`		`- pointerObject.transform.SetParent(CameraCache.Main.transform.parent);`
	`102`	`+ pointerObject.transform.SetParent(MixedRealityManager.Instance.MixedRealityPlayspace.transform);`
`103`	`103`
`104`	`104`	`if (pointer != null)`
`105`	`105`	`{`
Original file line number	Diff line number	Diff line change
`@@ -243,10 +243,10 @@ private void UpdateGripData(InteractionSourceState interactionSourceState, Mixed`
`243`	`243`	`interactionSourceState.sourcePose.TryGetPosition(out currentGripPosition, InteractionSourceNode.Grip);`
`244`	`244`	`interactionSourceState.sourcePose.TryGetRotation(out currentGripRotation, InteractionSourceNode.Grip);`
`245`	`245`
`246`		`- if (CameraCache.Main.transform.parent != null)`
	`246`	`+ if (MixedRealityManager.Instance.MixedRealityPlayspace.transform != null)`
`247`	`247`	`{`
`248`		`- currentGripPose.Position = CameraCache.Main.transform.parent.TransformPoint(currentGripPosition);`
`249`		`- currentGripPose.Rotation = Quaternion.Euler(CameraCache.Main.transform.parent.TransformDirection(currentGripRotation.eulerAngles));`
	`248`	`+ currentGripPose.Position = MixedRealityManager.Instance.MixedRealityPlayspace.transform.TransformPoint(currentGripPosition);`
	`249`	`+ currentGripPose.Rotation = Quaternion.Euler(MixedRealityManager.Instance.MixedRealityPlayspace.transform.TransformDirection(currentGripRotation.eulerAngles));`
`250`	`250`	`}`
`251`	`251`	`else`
`252`	`252`	`{`