Merge pull request #9995 from davidkline-ms/observationParent

Make the ObservedObjectParent public via the BaseSpatialObserver class

Author: David Kline

Assets/MRTK/Core/Providers/BaseSpatialMeshObserver.cs

@@ -32,13 +32,6 @@ protected BaseSpatialMeshObserver(
 
         protected MixedRealitySpatialAwarenessEventData<SpatialAwarenessMeshObject> meshEventData = null;
 
-        private GameObject observedObjectParent = null;
-
-        /// <summary>
-        /// The parent GameObject for all observed meshes to be placed under.
-        /// </summary>
-        protected virtual GameObject ObservedObjectParent => observedObjectParent != null ? observedObjectParent : (observedObjectParent = Service?.CreateSpatialAwarenessObservationParent(Name));
-
         protected virtual void ReadProfile()
         {
             if (ConfigurationProfile == null)

Assets/MRTK/Core/Providers/BaseSpatialObserver.cs

@@ -40,6 +40,14 @@ protected BaseSpatialObserver(
         [System.Obsolete("Call Service instead.")]
         protected IMixedRealitySpatialAwarenessSystem SpatialAwarenessSystem => Service;
 
+        private GameObject observedObjectParent = null;
+        protected virtual GameObject ObservedObjectParent => observedObjectParent != null ? observedObjectParent : (observedObjectParent = Service?.CreateSpatialAwarenessObservationParent(Name));
+
+        /// <summary>
+        /// The parent GameObject for all observed meshes to be placed under.
+        /// </summary>
+        public GameObject ObservationParent => ObservedObjectParent;
+
         /// <summary>
         /// Creates the spatial observer and handles the desired startup behavior.
         /// </summary>

Assets/MRTK/Providers/Experimental/WindowsSceneUnderstanding/WindowsSceneUnderstandingObserver.cs

@@ -380,14 +380,9 @@ public TextAsset SerializedScene
 
 #if SCENE_UNDERSTANDING_PRESENT && UNITY_WSA
 
-        #region Other Property
-        protected virtual GameObject ObservedObjectParent => observedObjectParent != null ? observedObjectParent : (observedObjectParent = Service?.CreateSpatialAwarenessObservationParent("WindowsMixedRealitySceneUnderstandingObserver"));
-        #endregion Other Property
-
         #region Private Fields
         private Task task;
         private readonly Dictionary<int, SpatialAwarenessSceneObject> sceneObjects = new Dictionary<int, SpatialAwarenessSceneObject>(256);
-        private GameObject observedObjectParent = null;
         private System.Timers.Timer firstUpdateTimer = null;
         private System.Timers.Timer updateTimer = null;
         private Dictionary<int, Tuple<SceneQuad, SceneObject>> cachedSceneQuads = new Dictionary<int, Tuple<SceneQuad, SceneObject>>(256);