Merge pull request #1 from StephenHodgson/vNEXT-Boundary

Boundary Change Requests

Author: David Kline

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

@@ -338,8 +338,6 @@ GameObject:
   m_Component:
   - component: {fileID: 353698135}
   - component: {fileID: 353698136}
-  - component: {fileID: 353698138}
-  - component: {fileID: 353698137}
   m_Layer: 0
   m_Name: BoundaryVisualizer
   m_TagString: Untagged
@@ -371,30 +369,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 647fd3dd3cb11e749850897a69f040db, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &353698137
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 353698134}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3bfc11696910c3a4a95bec35024e1ce0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  isPlayAreaVisualized: 1
---- !u!114 &353698138
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 353698134}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 85c42b1383d59b344b03d394b4d43861, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  isFloorPlaneVisualized: 1
 --- !u!1 &1229001241
 GameObject:
   m_ObjectHideFlags: 0

Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scripts/BoundaryIndicatorDemo.cs

@@ -2,8 +2,10 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Microsoft.MixedReality.Toolkit.Internal.Definitions.BoundarySystem;
-using Microsoft.MixedReality.Toolkit.Internal.Interfaces;
+using Microsoft.MixedReality.Toolkit.Internal.EventDatum.Boundary;
+using Microsoft.MixedReality.Toolkit.Internal.Interfaces.BoundarySystem;
 using Microsoft.MixedReality.Toolkit.Internal.Managers;
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Experimental.XR;
 
@@ -12,22 +14,63 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos
     /// <summary>
     /// Demo class to show different ways of using the boundary API.
     /// </summary>
-    public class BoundaryIndicatorDemo : MonoBehaviour
+    public class BoundaryIndicatorDemo : MonoBehaviour, IMixedRealityBoundaryHandler
     {
-        /// <summary>
-        /// Boundary system implementation.
-        /// </summary
-        private IMixedRealityBoundarySystem boundaryManager = null;
         private IMixedRealityBoundarySystem BoundaryManager => boundaryManager ?? (boundaryManager = MixedRealityManager.Instance.GetManager<IMixedRealityBoundarySystem>());
+        private IMixedRealityBoundarySystem boundaryManager = null;
+
+        private readonly List<GameObject> markers = new List<GameObject>();
+
+        #region MonoBehaviour Implementation
+
+        private void OnEnable()
+        {
+            BoundaryManager.Register(gameObject);
+        }
 
         private void Start()
         {
-            if (MixedRealityManager.HasActiveProfile && MixedRealityManager.Instance.ActiveProfile.IsBoundarySystemEnabled)
+            if (BoundaryManager != null && BoundaryManager.EnablePlatformBoundaryRendering)
+            {
+                if (markers.Count == 0)
+                {
+                    AddIndicators();
+                }
+            }
+        }
+
+        private void OnDisable()
+        {
+            BoundaryManager.Unregister(gameObject);
+        }
+
+        #endregion MonoBehaviour Implementation
+
+        #region IMixedRealityBoundaryHandler Implementation
+
+        /// <inheritdoc />
+        public void OnBoundaryVisualizationChanged(BoundaryEventData eventData)
+        {
+            if (eventData.IsPlatformRenderingEnabled)
             {
-                AddIndicators();
+                if (markers.Count == 0)
+                {
+                    AddIndicators();
+                }
+            }
+            else
+            {
+                for (int i = 0; i < markers.Count; i++)
+                {
+                    Destroy(markers[i]);
+                }
+
+                markers.Clear();
             }
         }
 
+        #endregion IMixedRealityBoundaryHandler Implementation
+
         /// <summary>
         /// Displays the boundary as an array of spheres where spheres in the
         /// bounds are a different color.
@@ -39,7 +82,8 @@ private void AddIndicators()
             float angleRect;
             float widthRect;
             float heightRect;
-            if ((BoundaryManager == null) || !BoundaryManager.TryGetRectangularBoundsParams(out centerRect, out angleRect, out widthRect, out heightRect))
+
+            if (!BoundaryManager.TryGetRectangularBoundsParams(out centerRect, out angleRect, out widthRect, out heightRect))
             {
                 // If we have no boundary manager or rectangular bounds we will show no indicators
                 return;
@@ -87,6 +131,8 @@ private void AddIndicators()
                     }
 
                     marker.GetComponent<MeshRenderer>().sharedMaterial = material;
+
+                    markers.Add(marker);
                 }
             }
         }