Fix boundary visualization for 2.5.2

Assets/MRTK/Core/Services/BaseBoundarySystem.cs

@@ -58,6 +58,8 @@ private void ReadProfile()
         /// <inheritdoc/>
         public override string Name { get; protected set; } = "Mixed Reality Boundary System";
 
+        private bool isInitialized = false;
+
         /// <inheritdoc/>
         public override void Initialize()
         {
@@ -72,6 +74,9 @@ public override void Initialize()
             SetTrackingSpace();
             CalculateBoundaryBounds();
 
+            isInitialized = true;
+
+            RefreshVisualization();
             RaiseBoundaryVisualizationChanged();
         }
 
@@ -316,17 +321,7 @@ public bool ShowFloor
                 {
                     showFloor = value;
 
-                    if (value && (currentFloorObject == null))
-                    {
-                        GetFloorVisualization();
-                    }
-
-                    if (currentFloorObject != null)
-                    {
-                        currentFloorObject.SetActive(value);
-                    }
-
-                    RaiseBoundaryVisualizationChanged();
+                    PropertyAction(value, currentFloorObject, () => GetFloorVisualization());
                 }
             }
         }
@@ -367,17 +362,7 @@ public bool ShowPlayArea
                 {
                     showPlayArea = value;
 
-                    if (value && (currentPlayAreaObject == null))
-                    {
-                        GetPlayAreaVisualization();
-                    }
-
-                    if (currentPlayAreaObject != null)
-                    {
-                        currentPlayAreaObject.SetActive(value);
-                    }
-
-                    RaiseBoundaryVisualizationChanged();
+                    PropertyAction(value, currentPlayAreaObject, () => GetPlayAreaVisualization());
                 }
             }
         }
@@ -419,17 +404,7 @@ public bool ShowTrackedArea
                 {
                     showTrackedArea = value;
 
-                    if (value && (currentTrackedAreaObject == null))
-                    {
-                        GetTrackedAreaVisualization();
-                    }
-
-                    if (currentTrackedAreaObject != null)
-                    {
-                        currentTrackedAreaObject.SetActive(value);
-                    }
-
-                    RaiseBoundaryVisualizationChanged();
+                    PropertyAction(value, currentTrackedAreaObject, () => GetTrackedAreaVisualization());
                 }
             }
         }
@@ -471,17 +446,7 @@ public bool ShowBoundaryWalls
                 {
                     showBoundaryWalls = value;
 
-                    if (value && (currentBoundaryWallObject == null))
-                    {
-                        GetBoundaryWallVisualization();
-                    }
-
-                    if (currentBoundaryWallObject != null)
-                    {
-                        currentBoundaryWallObject.SetActive(value);
-                    }
-
-                    RaiseBoundaryVisualizationChanged();
+                    PropertyAction(value, currentBoundaryWallObject, () => GetBoundaryWallVisualization());
                 }
             }
         }
@@ -523,17 +488,7 @@ public bool ShowBoundaryCeiling
                 {
                     showCeiling = value;
 
-                    if (value && (currentCeilingObject == null))
-                    {
-                        GetBoundaryCeilingVisualization();
-                    }
-
-                    if (currentCeilingObject != null)
-                    {
-                        currentCeilingObject.SetActive(value);
-                    }
-
-                    RaiseBoundaryVisualizationChanged();
+                    PropertyAction(value, currentCeilingObject, () => GetBoundaryCeilingVisualization());
                 }
             }
         }
@@ -563,6 +518,44 @@ public int CeilingPhysicsLayer
             }
         }
 
+        private void PropertyAction(bool value, GameObject boundaryObject, System.Action getVisualizationMethod, bool raiseEvent = true)
+        {
+            // If not done initializing, no need to raise the changed event or check the visualization.
+            // These will both happen at the end of the initialization flow.
+            if (!isInitialized)
+            {
+                return;
+            }
+
+            if (value && (boundaryObject == null))
+            {
+                getVisualizationMethod();
+            }
+
+            if (boundaryObject != null)
+            {
+                boundaryObject.SetActive(value);
+            }
+
+            if (raiseEvent)
+            {
+                RaiseBoundaryVisualizationChanged();
+            }
+        }
+
+        /// <summary>
+        /// Refreshes the current boundary visualizations without raising changed events.
+        /// Used during the initialization flow.
+        /// </summary>
+        private void RefreshVisualization()
+        {
+            PropertyAction(ShowFloor, currentFloorObject, () => GetFloorVisualization(), false);
+            PropertyAction(ShowPlayArea, currentPlayAreaObject, () => GetPlayAreaVisualization(), false);
+            PropertyAction(ShowTrackedArea, currentTrackedAreaObject, () => GetTrackedAreaVisualization(), false);
+            PropertyAction(ShowBoundaryWalls, currentBoundaryWallObject, () => GetBoundaryWallVisualization(), false);
+            PropertyAction(ShowBoundaryCeiling, currentCeilingObject, () => GetBoundaryCeilingVisualization(), false);
+        }
+
         /// <inheritdoc/>
         public Edge[] Bounds { get; protected set; } = System.Array.Empty<Edge>();