pr feedback and panel text updates

Author: David Kline (ANALOG)

Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scenes/BoundaryVisualization.unity

@@ -164,22 +164,12 @@ Prefab:
     - target: {fileID: 114995780653097258, guid: cf1e39a641f010e42a8168c9737d1803,
         type: 2}
       propertyPath: m_Text
-      value: 'This scene demonstrates visualizing the boundary geometry and a rectangular
-        playspace inscribed within those bounds.
-
-
-
-        Displays spheres that indicate areas within and outside of the boundary geometry.
-
-
-
-        Visualizes the inscribed rectangular play area. This visualization can be
-        toggled on and off in the inspector and from script.
-
-
-
-        Visualizes the floor. This visualization can be toggled on and off in the
-        inspector and from script.'
+      value: "This scene demonstrates visualizing the boundary geometry and a rectangular
+        playspace inscribed within those bounds.\n\n\nContols the visualization of
+        the user's configured boundary, including spheres that indicate the shape
+        of the space.\n\n\n     Instructs the Boundary System to show or hide the
+        floor.\n\n\n\n     Instructs the Boundary System to show or hide a rectanglular
+        representation of the user's Play Area."
       objectReference: {fileID: 0}
     - target: {fileID: 114713125240876806, guid: cf1e39a641f010e42a8168c9737d1803,
         type: 2}
@@ -196,12 +186,12 @@ Prefab:
     - target: {fileID: 114121190672569774, guid: cf1e39a641f010e42a8168c9737d1803,
         type: 2}
       propertyPath: m_Text
-      value: PlayAreaVisualizer.cs
+      value: '    Show Floor'
       objectReference: {fileID: 0}
     - target: {fileID: 114186135864427680, guid: cf1e39a641f010e42a8168c9737d1803,
         type: 2}
       propertyPath: m_Text
-      value: FloorPlaneVisualizer.cs
+      value: '    Show Play Area'
       objectReference: {fileID: 0}
     - target: {fileID: 224849082003076088, guid: cf1e39a641f010e42a8168c9737d1803,
         type: 2}
@@ -369,6 +359,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 647fd3dd3cb11e749850897a69f040db, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  showFloor: 1
+  showPlayArea: 1
 --- !u!1 &1229001241
 GameObject:
   m_ObjectHideFlags: 0

Assets/MixedRealityToolkit-SDK/Features/Boundary/System/MixedRealityBoundarySystem.cs

@@ -214,7 +214,10 @@ public bool ShowFloor
                         GetFloorVisualization();
                     }
 
-                    currentFloorPlane?.SetActive(value);
+                    if (currentFloorPlane != null)
+                    {
+                        currentFloorPlane.SetActive(value);
+                    }
 
                     RaiseBoundaryVisualizationChanged();
                 }
@@ -238,7 +241,10 @@ public bool ShowPlayArea
                         GetPlayAreaVisualization();
                     }
 
-                    currentPlayArea?.SetActive(value);
+                    if (currentPlayArea != null)
+                    {
+                        currentPlayArea.SetActive(value);
+                    }
 
                     RaiseBoundaryVisualizationChanged();
                 }
@@ -258,7 +264,7 @@ public bool ShowPlayArea
         public float? FloorHeight { get; private set; } = null;
 
         /// <inheritdoc/>
-        public bool Contains(Vector3 location, UnityEngine.Experimental.XR.Boundary.Type boundaryType = UnityEngine.Experimental.XR.Boundary.Type.TrackedArea)
+        public bool Contains(Vector3 location, Boundary.Type boundaryType = Boundary.Type.TrackedArea)
         {
             if (!EdgeUtilities.IsValidPoint(location))
             {
@@ -285,15 +291,15 @@ public bool Contains(Vector3 location, UnityEngine.Experimental.XR.Boundary.Type
             // Boundary coordinates are always "on the floor"
             Vector2 point = new Vector2(location.x, location.z);
 
-            if (boundaryType == UnityEngine.Experimental.XR.Boundary.Type.PlayArea)
+            if (boundaryType == Boundary.Type.PlayArea)
             {
                 // Check the inscribed rectangle.
                 if (rectangularBounds != null)
                 {
                     return rectangularBounds.IsInsideBoundary(point);
                 }
             }
-            else if (boundaryType == UnityEngine.Experimental.XR.Boundary.Type.TrackedArea)
+            else if (boundaryType == Boundary.Type.TrackedArea)
             {
                 // Check the geometry
                 return EdgeUtilities.IsInsideBoundary(Bounds, point);
@@ -365,7 +371,6 @@ public GameObject GetFloorVisualization()
         {
             if (currentFloorPlane != null)
             {
-                // We already have a floor plane.
                 return currentFloorPlane;
             }
 

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityBoundaryVisualizationProfile.asset

@@ -11,8 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8989e381a7c097840b2d40378a63497a, type: 3}
   m_Name: DefaultMixedRealityBoundaryVisualizationProfile
   m_EditorClassIdentifier: 
-  boundaryHeight: 3
   playAreaMaterial: {fileID: 2100000, guid: 30d693ff62c571241b431ef4e206b09a, type: 2}
   trackedAreaMaterial: {fileID: 2100000, guid: 1ab3a050711c97243a200ca653272343, type: 2}
   floorPlaneMaterial: {fileID: 2100000, guid: e106645f46550d54bacf6c82811c99e6, type: 2}
-  floorPlaneScale: {x: 5, y: 5, z: 1}
+  floorPlaneScale: {x: 3, y: 3, z: 1}

Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityConfigurationProfile.cs

@@ -206,7 +206,7 @@ public SystemType BoundarySystemSystemType
         private float boundaryHeight = 3.0f;
 
         /// <summary>
-        /// The approximate height of the play space, in meters.
+        /// 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.

Assets/MixedRealityToolkit/_Core/EventDatum/Boundary/BoundaryEventData.cs

@@ -11,12 +11,12 @@ namespace Microsoft.MixedReality.Toolkit.Internal.EventDatum.Boundary
     /// </summary>
     public class BoundaryEventData : GenericBaseEventData
     {
-        /// <summary>
-        /// Is the ceiling being visualized by the boundary system.
-        /// </summary>
-        /// <remarks>
-        /// The boundary system defines the ceiling as a plane set at <see cref="IMixedRealityBoundarySystem.BoundaryHeight"/> above the floor.
-        /// </remarks>
+        ///// <summary>
+        ///// Is the ceiling being visualized by the boundary system.
+        ///// </summary>
+        ///// <remarks>
+        ///// The boundary system defines the ceiling as a plane set at <see cref="IMixedRealityBoundarySystem.BoundaryHeight"/> above the floor.
+        ///// </remarks>
         // todo: coming in Beta
         // public bool IsCeilingVisualized { get; private set; }
 
@@ -30,15 +30,15 @@ public class BoundaryEventData : GenericBaseEventData
         /// </summary>
         public bool IsPlayAreaVisualized { get; private set; }
 
-        /// <summary>
-        /// Is the tracked area being visualized by the boundary system.
-        /// </summary>
+        ///// <summary>
+        ///// Is the tracked area being visualized by the boundary system.
+        ///// </summary>
         // todo: coming in Beta
         // public bool IsTrackedAreaVisualized { get; private set; }
 
-        /// <summary>
-        /// Are the boundary walls being visualized by the boundary system.
-        /// </summary>
+        ///// <summary>
+        ///// Are the boundary walls being visualized by the boundary system.
+        ///// </summary>
         // todo: coming in Beta
         // public bool AreBoundaryWallsVisualized { get; private set; }
 

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

@@ -38,6 +38,11 @@ public override void OnInspectorGUI()
             EditorGUILayout.HelpBox("Boundary visualizations can help users stay oriented and comfortable in the experience.", MessageType.Info);
             EditorGUILayout.Space();
 
+            if (!CheckMixedRealityManager())
+            {
+                return;
+            }
+
             serializedObject.Update();
 
             GUILayout.Space(12f);

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

@@ -15,8 +15,6 @@ public class MixedRealityConfigurationProfileInspector : MixedRealityBaseConfigu
     {
         private static readonly GUIContent TargetScaleContent = new GUIContent("Target Scale:");
         private static readonly GUIContent NewProfileContent = new GUIContent("+", "Create New Profile");
-        private static readonly GUIContent BoundaryHeightContent = new GUIContent("Boundary Height:");
-        private static readonly GUIContent BoundaryVisualizationProfileContent = new GUIContent("Boundary Visualization Profile");
 
         // Experience properties
         private SerializedProperty targetExperienceScale;
@@ -190,8 +188,8 @@ public override void OnInspectorGUI()
                 // Boundary settings depend on the experience scale
                 if (scale == ExperienceScale.Room)
                 {
-                    EditorGUILayout.PropertyField(boundaryHeight, BoundaryHeightContent);
-                    EditorGUILayout.PropertyField(boundaryVisualizationProfile, BoundaryVisualizationProfileContent);
+                    EditorGUILayout.PropertyField(boundaryHeight);
+                    RenderProfile(boundaryVisualizationProfile);
                 }
                 else
                 {