finished up boundary events

Author: StephenHodgson

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

@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using System.Collections.Generic;
 using Microsoft.MixedReality.Toolkit.Internal.Definitions.BoundarySystem;
+using Microsoft.MixedReality.Toolkit.Internal.EventDatum.Boundary;
 using Microsoft.MixedReality.Toolkit.Internal.Interfaces.BoundarySystem;
 using Microsoft.MixedReality.Toolkit.Internal.Managers;
 using UnityEngine;
@@ -12,22 +14,52 @@ 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()
+        private void OnDisable()
         {
-            if (MixedRealityManager.HasActiveProfile && MixedRealityManager.Instance.ActiveProfile.IsBoundarySystemEnabled)
+            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 +71,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 +120,8 @@ private void AddIndicators()
                     }
 
                     marker.GetComponent<MeshRenderer>().sharedMaterial = material;
+
+                    markers.Add(marker);
                 }
             }
         }

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

@@ -5,6 +5,7 @@
 using Microsoft.MixedReality.Toolkit.Internal.Interfaces.BoundarySystem;
 using Microsoft.MixedReality.Toolkit.Internal.Managers;
 using Microsoft.MixedReality.Toolkit.Internal.Utilities;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
@@ -87,6 +88,29 @@ public override void Unregister(GameObject listener)
 
         #endregion
 
+        #region IMixedRealityEventSource Implementation
+
+        /// <inheritdoc />
+        bool IEqualityComparer.Equals(object x, object y)
+        {
+            // There shouldn't be other Boundary Managers to compare to.
+            return false;
+        }
+
+        /// <inheritdoc />
+        public int GetHashCode(object obj)
+        {
+            return Mathf.Abs(SourceName.GetHashCode());
+        }
+
+        /// <inheritdoc />
+        public uint SourceId { get; } = 0;
+
+        /// <inheritdoc />
+        public string SourceName { get; } = "Mixed Reality Boundary System";
+
+        #endregion IMixedRealityEventSource Implementation
+
         #region IMixedRealityBoundarySystem Implementation
 
         /// <inheritdoc/>
@@ -266,6 +290,7 @@ public GameObject CreateFloorPlaneVisualization()
         private InscribedRectangle rectangularBounds = null;
 
         private GameObject currentPlayArea;
+
         private GameObject currentFloorPlane;
 
         /// <summary>

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityConfigurationProfile.asset

@@ -12,10 +12,10 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityConfigurationProfile
   m_EditorClassIdentifier: 
   initialManagerTypes:
-  - reference: Microsoft.MixedReality.Toolkit.SDK.BoundarySystem.MixedRealityBoundaryManager,
-      Microsoft.MixedReality.Toolkit.SDK
   - reference: Microsoft.MixedReality.Toolkit.SDK.Input.MixedRealityInputManager,
       Microsoft.MixedReality.Toolkit.SDK
+  - reference: Microsoft.MixedReality.Toolkit.SDK.BoundarySystem.MixedRealityBoundaryManager,
+      Microsoft.MixedReality.Toolkit.SDK
   targetExperienceScale: 3
   enableCameraProfile: 1
   cameraProfile: {fileID: 11400000, guid: b9a895b32a50a7f45b1e4da728d50741, type: 2}
@@ -35,6 +35,6 @@ MonoBehaviour:
   boundarySystemType:
     reference: Microsoft.MixedReality.Toolkit.SDK.BoundarySystem.MixedRealityBoundaryManager,
       Microsoft.MixedReality.Toolkit.SDK
-  enablePlatformBoundaryRendering: 0
+  enablePlatformBoundaryRendering: 1
   boundaryVisualizationProfile: {fileID: 11400000, guid: c1f4aa213e301a446aca3858e6f4ad17,
     type: 2}

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

@@ -1,6 +1,7 @@
 // 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.Internal.Interfaces.BoundarySystem;
 using UnityEngine.EventSystems;
 
 namespace Microsoft.MixedReality.Toolkit.Internal.EventDatum.Boundary
@@ -10,12 +11,21 @@ namespace Microsoft.MixedReality.Toolkit.Internal.EventDatum.Boundary
     /// </summary>
     public class BoundaryEventData : GenericBaseEventData
     {
+        /// <summary>
+        /// The new state of the Boundary systems platform rendering.
+        /// </summary>
+        public bool IsPlatformRenderingEnabled { get; private set; }
+
         /// <summary>
         /// Constructor.
         /// </summary>
         /// <param name="eventSystem"></param>
-        public BoundaryEventData(EventSystem eventSystem) : base(eventSystem)
+        public BoundaryEventData(EventSystem eventSystem) : base(eventSystem) { }
+
+        public void Initialize(IMixedRealityBoundarySystem boundarySystem, bool isPlatformRenderingEnabled)
         {
+            base.BaseInitialize(boundarySystem);
+            IsPlatformRenderingEnabled = isPlatformRenderingEnabled;
         }
     }
 }

Assets/MixedRealityToolkit/_Core/Interfaces/BoundarySystem/IMixedRealityBoundaryHandler.cs

@@ -1,11 +1,17 @@
 // 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.Internal.EventDatum.Boundary;
 using UnityEngine.EventSystems;
 
 namespace Microsoft.MixedReality.Toolkit.Internal.Interfaces.BoundarySystem
 {
     public interface IMixedRealityBoundaryHandler : IEventSystemHandler
     {
+        /// <summary>
+        /// Raised when the boundary visualization has changed.
+        /// </summary>
+        /// <param name="eventData"></param>
+        void OnBoundaryVisualizationChanged(BoundaryEventData eventData);
     }
 }

Assets/MixedRealityToolkit/_Core/Interfaces/BoundarySystem/IMixedRealityBoundarySystem.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Microsoft.MixedReality.Toolkit.Internal.Definitions.Utilities;
+using Microsoft.MixedReality.Toolkit.Internal.Interfaces.Events;
 using UnityEngine;
 using UnityEngine.Experimental.XR;
 
@@ -11,7 +12,7 @@ namespace Microsoft.MixedReality.Toolkit.Internal.Interfaces.BoundarySystem
     /// Manager interface for a Boundary system in the Mixed Reality Toolkit
     /// All replacement systems for providing Boundary functionality should derive from this interface
     /// </summary>
-    public interface IMixedRealityBoundarySystem : IMixedRealityManager
+    public interface IMixedRealityBoundarySystem : IMixedRealityEventSystem, IMixedRealityEventSource
     {
         /// <summary>
         /// The scale (ex: World Scale) of the experience.