moved boundary height into boundary visualization profile.

removed teleport duration from main config profile, as it's currently unimplemented anyway

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Features/Boundary/MixedRealityBoundaryManager.cs

@@ -40,7 +40,7 @@ private void InitializeInternal()
             boundaryEventData = new BoundaryEventData(EventSystem.current);
 
             Scale = MixedRealityManager.Instance.ActiveProfile.TargetExperienceScale;
-            BoundaryHeight = MixedRealityManager.Instance.ActiveProfile.BoundaryHeight;
+            BoundaryHeight = MixedRealityManager.Instance.ActiveProfile.BoundaryVisualizationProfile.BoundaryHeight;
 
             SetTrackingSpace();
             CalculateBoundaryBounds();

Assets/MixedRealityToolkit-SDK/Features/Teleportation/MixedRealityTeleportManager.cs

@@ -74,7 +74,6 @@ private void InitializeInternal()
             }
 #endif // UNITY_EDITOR
 
-            TeleportDuration = MixedRealityManager.Instance.ActiveProfile.TeleportDuration;
             teleportEventData = new TeleportEventData(EventSystem.current);
         }
 

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityConfigurationProfile.asset

@@ -12,10 +12,12 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityConfigurationProfile
   m_EditorClassIdentifier: 
   initialManagerTypes:
-  - reference: Microsoft.MixedReality.Toolkit.SDK.Input.MixedRealityInputManager,
+  - reference: Microsoft.MixedReality.Toolkit.SDK.Teleportation.MixedRealityTeleportManager,
       Microsoft.MixedReality.Toolkit.SDK
   - reference: Microsoft.MixedReality.Toolkit.SDK.BoundarySystem.MixedRealityBoundaryManager,
       Microsoft.MixedReality.Toolkit.SDK
+  - reference: Microsoft.MixedReality.Toolkit.SDK.Input.MixedRealityInputManager,
+      Microsoft.MixedReality.Toolkit.SDK
   targetExperienceScale: 3
   enableCameraProfile: 1
   cameraProfile: {fileID: 11400000, guid: 8089ccfdd4494cd38f676f9fc1f46a04, type: 2}
@@ -28,7 +30,6 @@ MonoBehaviour:
   boundarySystemType:
     reference: Microsoft.MixedReality.Toolkit.SDK.BoundarySystem.MixedRealityBoundaryManager,
       Microsoft.MixedReality.Toolkit.SDK
-  boundaryHeight: 3
   boundaryVisualizationProfile: {fileID: 11400000, guid: 6d28cce596b44bd3897ca86f8b24e076,
     type: 2}
   enableTeleportSystem: 1

Assets/MixedRealityToolkit/_Core/Definitions/BoundarySystem/MixedRealityBoundaryVisualizationProfile.cs

@@ -12,6 +12,18 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.BoundarySystem
     [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Boundary Visualization Profile", fileName = "MixedRealityBoundaryVisualizationProfile", order = (int)CreateProfileMenuItemIndices.BoundaryVisualization)]
     public class MixedRealityBoundaryVisualizationProfile : ScriptableObject
     {
+        [SerializeField]
+        [Tooltip("The approximate height of the play space, in meters.")]
+        private float boundaryHeight = 3.0f;
+
+        /// <summary>
+        /// The developer defined height of the boundary, in meters.
+        /// </summary>
+        /// <remarks>
+        /// The BoundaryHeight property is used to create a three dimensional volume for the play space.
+        /// </remarks>
+        public float BoundaryHeight => boundaryHeight;
+
         #region Floor settings
 
         [SerializeField]

Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityConfigurationProfile.cs

@@ -149,18 +149,6 @@ public SystemType BoundarySystemSystemType
             private set { boundarySystemType = value; }
         }
 
-        [SerializeField]
-        [Tooltip("The approximate height of the play space, in meters.")]
-        private float boundaryHeight = 3.0f;
-
-        /// <summary>
-        /// The developer defined height of the boundary, in meters.
-        /// </summary>
-        /// <remarks>
-        /// The BoundaryHeight property is used to create a three dimensional volume for the play space.
-        /// </remarks>
-        public float BoundaryHeight => boundaryHeight;
-
         [SerializeField]
         [Tooltip("Profile for wiring up boundary visualization assets.")]
         private MixedRealityBoundaryVisualizationProfile boundaryVisualizationProfile;
@@ -201,19 +189,6 @@ public SystemType TeleportSystemSystemType
             private set { teleportSystemType = value; }
         }
 
-        [SerializeField]
-        [Tooltip("The duration of the teleport in seconds.")]
-        private float teleportDuration = 0.25f;
-
-        /// <summary>
-        /// The duration of the teleport in seconds.
-        /// </summary>
-        public float TeleportDuration
-        {
-            get { return teleportDuration; }
-            set { teleportDuration = value; }
-        }
-
         [SerializeField]
         [Tooltip("All the additional non-required systems, features, and managers registered with the Mixed Reality Manager.")]
         private MixedRealityRegisteredComponentsProfile registeredComponentsProfile = null;

Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityBoundaryVisualizationProfileInspector.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Microsoft.MixedReality.Toolkit.Core.Definitions.BoundarySystem;
+using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
 using Microsoft.MixedReality.Toolkit.Core.Managers;
 using UnityEditor;
 using UnityEngine;
@@ -11,6 +12,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Inspectors.Profiles
     [CustomEditor(typeof(MixedRealityBoundaryVisualizationProfile))]
     public class MixedRealityBoundaryVisualizationProfileInspector : MixedRealityBaseConfigurationProfileInspector
     {
+        private SerializedProperty boundaryHeight;
         private SerializedProperty showFloor;
         private SerializedProperty floorMaterial;
         private SerializedProperty floorScale;
@@ -38,6 +40,8 @@ private void OnEnable()
                 return;
             }
 
+            boundaryHeight = serializedObject.FindProperty("boundaryHeight");
+
             showFloor = serializedObject.FindProperty("showFloor");
             floorMaterial = serializedObject.FindProperty("floorMaterial");
             floorScale = serializedObject.FindProperty("floorScale");
@@ -71,8 +75,16 @@ public override void OnInspectorGUI()
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Boundary Visualization Options", EditorStyles.boldLabel);
             EditorGUILayout.HelpBox("Boundary visualizations can help users stay oriented and comfortable in the experience.", MessageType.Info);
+            // Boundary settings depend on the experience scale
+            if (MixedRealityManager.Instance.ActiveProfile.TargetExperienceScale != ExperienceScale.Room)
+            {
+                EditorGUILayout.Space();
+                EditorGUILayout.HelpBox("Boundary visualization is only supported in Room scale experiences.", MessageType.Warning);
+            }
             EditorGUILayout.Space();
             serializedObject.Update();
+            EditorGUILayout.PropertyField(boundaryHeight);
+            EditorGUILayout.Space();
             EditorGUILayout.LabelField("Floor Settings:", EditorStyles.boldLabel);
             EditorGUILayout.PropertyField(showFloor, showContent);
             EditorGUILayout.PropertyField(floorMaterial, materialContent);

Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityConfigurationProfileInspector.cs

@@ -26,11 +26,9 @@ public class MixedRealityConfigurationProfileInspector : MixedRealityBaseConfigu
         // Boundary system properties
         private SerializedProperty enableBoundarySystem;
         private SerializedProperty boundarySystemType;
-        private SerializedProperty boundaryHeight;
         // Teleport system properties
         private SerializedProperty enableTeleportSystem;
         private SerializedProperty teleportSystemType;
-        private SerializedProperty teleportDuration;
         private SerializedProperty boundaryVisualizationProfile;
 
         private SerializedProperty registeredComponentsProfile;
@@ -87,11 +85,9 @@ private void OnEnable()
             // Boundary system configuration
             enableBoundarySystem = serializedObject.FindProperty("enableBoundarySystem");
             boundarySystemType = serializedObject.FindProperty("boundarySystemType");
-            boundaryHeight = serializedObject.FindProperty("boundaryHeight");
             // Teleport system configuration
             enableTeleportSystem = serializedObject.FindProperty("enableTeleportSystem");
             teleportSystemType = serializedObject.FindProperty("teleportSystemType");
-            teleportDuration = serializedObject.FindProperty("teleportDuration");
             boundaryVisualizationProfile = serializedObject.FindProperty("boundaryVisualizationProfile");
             registeredComponentsProfile = serializedObject.FindProperty("registeredComponentsProfile");
         }
@@ -166,25 +162,20 @@ public override void OnInspectorGUI()
             EditorGUILayout.LabelField("Boundary System Settings", EditorStyles.boldLabel);
             EditorGUILayout.PropertyField(enableBoundarySystem);
             EditorGUILayout.PropertyField(boundarySystemType);
+            changed |= RenderProfile(boundaryVisualizationProfile);
 
             // Boundary settings depend on the experience scale
-            if (scale == ExperienceScale.Room)
-            {
-                EditorGUILayout.PropertyField(boundaryHeight);
-                changed |= RenderProfile(boundaryVisualizationProfile);
-            }
-            else
+            if (scale != ExperienceScale.Room)
             {
                 GUILayout.Space(6f);
-                EditorGUILayout.HelpBox("Boundary visualization is only supported in Room scale experiences.", MessageType.Info);
+                EditorGUILayout.HelpBox("Boundary visualization is only supported in Room scale experiences.", MessageType.Warning);
             }
 
             // Teleport System configuration
             GUILayout.Space(12f);
             EditorGUILayout.LabelField("Teleport System Settings", EditorStyles.boldLabel);
             EditorGUILayout.PropertyField(enableTeleportSystem);
             EditorGUILayout.PropertyField(teleportSystemType);
-            EditorGUILayout.PropertyField(teleportDuration);
 
             GUILayout.Space(12f);
             changed |= RenderProfile(registeredComponentsProfile);