Merge pull request #4834 from microsoft/prerelease/2.0.0.rc2_stabilization

RC2 Release

Author: wiwei

.gitignore

@@ -73,3 +73,8 @@ Assets/StreamingAssets.meta
 # DocFX Generated #
 # =============== #
 doc/
+
+# =========================================== #
+# Asset Script Reference Retargeter Generated #
+# =========================================== #
+NuGet/

Assets/MixedRealityToolkit.Examples/Demos/Boundary/Scripts/BoundaryVisualizationDemo.cs

@@ -32,19 +32,32 @@ public class BoundaryVisualizationDemo : MonoBehaviour, IMixedRealityBoundaryHan
         [SerializeField]
         private bool showBoundaryCeiling = true;
 
+        private IMixedRealityBoundarySystem boundarySystem = null;
+
+        private IMixedRealityBoundarySystem BoundarySystem
+        {
+            get
+            {
+                if (boundarySystem == null)
+                {
+                    MixedRealityServiceRegistry.TryGetService<IMixedRealityBoundarySystem>(out boundarySystem);
+                }
+                return boundarySystem;
+            }
+        }
+
         #region MonoBehaviour Implementation
 
         private void Awake()
         {
             markerParent = new GameObject();
             markerParent.name = "Boundary Demo Markers";
-            markerParent.transform.parent = MixedRealityToolkit.Instance.MixedRealityPlayspace;
+            MixedRealityPlayspace.AddChild(markerParent.transform);
         }
 
         private void Start()
         {
-
-            if (MixedRealityToolkit.BoundarySystem != null)
+            if (BoundarySystem != null)
             {
                 if (markers.Count == 0)
                 {
@@ -55,25 +68,24 @@ private void Start()
 
         private void Update()
         {
-            if (MixedRealityToolkit.BoundarySystem != null)
+            if (BoundarySystem != null)
             {
-                MixedRealityToolkit.BoundarySystem.ShowFloor = showFloor;
-                MixedRealityToolkit.BoundarySystem.ShowPlayArea = showPlayArea;
-                MixedRealityToolkit.BoundarySystem.ShowTrackedArea = showTrackedArea;
-                MixedRealityToolkit.BoundarySystem.ShowBoundaryWalls = showBoundaryWalls;
-                MixedRealityToolkit.BoundarySystem.ShowBoundaryCeiling = showBoundaryCeiling;
+                BoundarySystem.ShowFloor = showFloor;
+                BoundarySystem.ShowPlayArea = showPlayArea;
+                BoundarySystem.ShowTrackedArea = showTrackedArea;
+                BoundarySystem.ShowBoundaryWalls = showBoundaryWalls;
+                BoundarySystem.ShowBoundaryCeiling = showBoundaryCeiling;
             }
         }
 
-        private async void OnEnable()
+        private void OnEnable()
         {
-            await new WaitUntil(() => MixedRealityToolkit.BoundarySystem != null);
-            MixedRealityToolkit.BoundarySystem.Register(gameObject);
+            BoundarySystem?.Register(gameObject);
         }
 
         private void OnDisable()
         {
-            MixedRealityToolkit.BoundarySystem?.Unregister(gameObject);
+            BoundarySystem?.Unregister(gameObject);
         }
 
         #endregion MonoBehaviour Implementation
@@ -100,18 +112,30 @@ private void AddMarkers()
             float widthRect;
             float heightRect;
 
-            if (!MixedRealityToolkit.BoundarySystem.TryGetRectangularBoundsParams(out centerRect, out angleRect, out widthRect, out heightRect))
+            if (BoundarySystem == null) { return; }
+
+            if (!BoundarySystem.TryGetRectangularBoundsParams(out centerRect, out angleRect, out widthRect, out heightRect))
             {
                 // If we have no boundary manager or rectangular bounds we will show no indicators
                 return;
             }
 
-            MixedRealityBoundaryVisualizationProfile visualizationProfile = MixedRealityToolkit.Instance.ActiveProfile.BoundaryVisualizationProfile;
-            if (visualizationProfile == null)
+            // Get the materials needed for marker display
+            GameObject playArea = BoundarySystem.GetPlayAreaVisualization();
+            if (playArea == null)
+            {
+                // Failed to get the play area visualization;
+                return;
+            }
+            Material playAreaMaterial = playArea.GetComponent<Renderer>().sharedMaterial;
+
+            GameObject trackedArea = BoundarySystem.GetTrackedAreaVisualization();
+            if (trackedArea == null)
             {
-                // We do not have a visualization profile configured, therefore do not render the indicators.
+                // Failed to get the tracked area visualization;
                 return;
             }
+            Material trackedAreaMaterial = trackedArea.GetComponent<Renderer>().sharedMaterial;
 
             const int indicatorCount = 20;
             const float indicatorDistance = 0.2f;
@@ -131,14 +155,14 @@ private void AddMarkers()
 
                     Material material = null;
                     // Check inscribed rectangle first
-                    if (MixedRealityToolkit.BoundarySystem.Contains(position, UnityBoundary.Type.PlayArea))
+                    if (BoundarySystem.Contains(position, UnityBoundary.Type.PlayArea))
                     {
-                        material = visualizationProfile.PlayAreaMaterial;
+                        material = playAreaMaterial;
                     }
                     // Then check geometry
-                    else if (MixedRealityToolkit.BoundarySystem.Contains(position, UnityBoundary.Type.TrackedArea))
+                    else if (BoundarySystem.Contains(position, UnityBoundary.Type.TrackedArea))
                     {
-                        material = visualizationProfile.TrackedAreaMaterial;
+                        material = trackedAreaMaterial;
                     }
 
                     if (material != null)

Assets/MixedRealityToolkit.Examples/Demos/Diagnostics/Scripts/DiagnosticsDemoControls.cs

@@ -1,41 +1,50 @@
 // 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.Diagnostics;
 using Microsoft.MixedReality.Toolkit.Utilities;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.Examples.Demos
 {
     public class DiagnosticsDemoControls : MonoBehaviour
     {
-        private async void Start()
+        private IMixedRealityDiagnosticsSystem diagnosticsSystem = null;
+
+        private IMixedRealityDiagnosticsSystem DiagnosticsSystem
         {
-            if (!MixedRealityToolkit.Instance.ActiveProfile.IsDiagnosticsSystemEnabled)
+            get
             {
-                Debug.LogWarning("Diagnostics system is disabled. To run this demo, it needs to be enabled. Check your configuration settings.");
-                return;
+                if (diagnosticsSystem == null)
+                {
+                    MixedRealityServiceRegistry.TryGetService<IMixedRealityDiagnosticsSystem>(out diagnosticsSystem);
+                }
+                return diagnosticsSystem;
             }
+        }
 
-            await new WaitUntil(() => MixedRealityToolkit.DiagnosticsSystem != null);
+        private async void Start()
+        {
+            await new WaitUntil(() => DiagnosticsSystem != null);
 
-            // Turn on the diagnostic visualizations for this demo.
-            MixedRealityToolkit.DiagnosticsSystem.ShowDiagnostics = true;
+            // Ensure the diagnostic visualizations are turned on.
+            DiagnosticsSystem.ShowDiagnostics = true;
         }
 
         /// <summary>
         /// Shows or hides all enabled diagnostics.
         /// </summary>
         public void OnToggleDiagnostics()
         {
-            MixedRealityToolkit.DiagnosticsSystem.ShowDiagnostics = !MixedRealityToolkit.DiagnosticsSystem.ShowDiagnostics;
+            DiagnosticsSystem.ShowDiagnostics = !DiagnosticsSystem.ShowDiagnostics;
         }
 
         /// <summary>
         /// Shows or hides the profiler display.
         /// </summary>
         public void OnToggleProfiler()
         {
-            MixedRealityToolkit.DiagnosticsSystem.ShowProfiler = !MixedRealityToolkit.DiagnosticsSystem.ShowProfiler;
+            DiagnosticsSystem.ShowProfiler = !DiagnosticsSystem.ShowProfiler;
         }
     }
 }