complete scaffolding, shorten enum names, update docs

Author: David Kline (ANALOG)

Assets/MixedRealityToolkit-SDK/Features/SpatialAwareness/System/MixedRealitySpatialAwarenessPlanarSurfaceDescription.cs

@@ -21,14 +21,14 @@ public Vector3 Normal
         { get; private set; }
 
         /// <inheritdoc />
-        public MixedRealitySpatialAwarenessSurfaceTypes SurfaceType
+        public SpatialAwarenessSurfaceTypes SurfaceType
         { get; private set; }
 
         public MixedRealitySpatialAwarenessPlanarSurfaceDescription(
             Vector3 position,
             Bounds boundingBox,
             Vector3 normal,
-            MixedRealitySpatialAwarenessSurfaceTypes surfaceType) : base(position)
+            SpatialAwarenessSurfaceTypes surfaceType) : base(position)
         {
             BoundingBox = boundingBox;
             Normal = normal;

Assets/MixedRealityToolkit-SDK/Features/SpatialAwareness/System/MixedRealitySpatialAwarenessSystem.cs

@@ -6,7 +6,6 @@
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.SpatialAwarenessSystem;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.SpatialAwarenessSystem.Handlers;
 using Microsoft.MixedReality.Toolkit.Core.Managers;
-using Microsoft.MixedReality.Toolkit.Core.Utilities;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -245,7 +244,7 @@ private void RaiseSurfaceAdded(
             Vector3 position,
             Bounds boundingBox,
             Vector3 normal,
-            MixedRealitySpatialAwarenessSurfaceTypes surfaceType,
+            SpatialAwarenessSurfaceTypes surfaceType,
             GameObject surfaceObject = null)
         {
             // todo
@@ -276,7 +275,7 @@ private void RaiseSurfaceUpdated(
             Vector3 position,
             Bounds boundingBox,
             Vector3 normal,
-            MixedRealitySpatialAwarenessSurfaceTypes surfaceType,
+            SpatialAwarenessSurfaceTypes surfaceType,
             GameObject surfaceObject = null)
         {
             // todo
@@ -405,18 +404,26 @@ public void ResumeObserver()
         {
             if (IsObserverRunning) { return; }
 
+#if UNITY_WSA
             // todo
+#endif // UNITY_WSA
+
+            IsObserverRunning = true;
         }
 
         /// <inheritdoc />
         public void SuspendObserver()
         {
             if (!IsObserverRunning) { return; }
 
+#if UNITY_WSA
             // todo
+#endif // UNITY_WSA
+
+            IsObserverRunning = false;
         }
 
-        #region Mesh Handling implementation
+#region Mesh Handling implementation
 
         /// <inheritdoc />
         public bool UseMeshSystem { get; set; } = true;
@@ -427,10 +434,10 @@ public void SuspendObserver()
         /// <inheritdoc />
         public int MeshPhysicsLayerMask => 1 << MeshPhysicsLayer;
 
-        private MixedRealitySpatialAwarenessMeshLevelOfDetail meshLevelOfDetail = MixedRealitySpatialAwarenessMeshLevelOfDetail.Coarse;
+        private SpatialAwarenessMeshLevelOfDetail meshLevelOfDetail = SpatialAwarenessMeshLevelOfDetail.Coarse;
 
         /// <inheritdoc />
-        public MixedRealitySpatialAwarenessMeshLevelOfDetail MeshLevelOfDetail
+        public SpatialAwarenessMeshLevelOfDetail MeshLevelOfDetail
         {
             get
             { 
@@ -447,7 +454,7 @@ public MixedRealitySpatialAwarenessMeshLevelOfDetail MeshLevelOfDetail
                 if (meshLevelOfDetail != value)
                 {
                     // Non-custom values automatically modify MeshTrianglesPerCubicMeter
-                    if (value != MixedRealitySpatialAwarenessMeshLevelOfDetail.Custom)
+                    if (value != SpatialAwarenessMeshLevelOfDetail.Custom)
                     {
                         meshTrianglesPerCubicMeter = (int)value;
                     }
@@ -457,7 +464,7 @@ public MixedRealitySpatialAwarenessMeshLevelOfDetail MeshLevelOfDetail
             }
         }
 
-        private int meshTrianglesPerCubicMeter = (int)MixedRealitySpatialAwarenessMeshLevelOfDetail.Coarse;
+        private int meshTrianglesPerCubicMeter = (int)SpatialAwarenessMeshLevelOfDetail.Coarse;
 
         /// <inheritdoc />
         public int MeshTrianglesPerCubicMeter
@@ -504,9 +511,9 @@ public Dictionary<uint, GameObject> GetMeshObjects()
             return new Dictionary<uint, GameObject>(0);
         }
 
-        #endregion Mesh Handling implementation
+#endregion Mesh Handling implementation
 
-        #region Surface Finding Handling implementation
+#region Surface Finding Handling implementation
 
         /// <inheritdoc />
         public bool UseSurfaceFindingSystem { get; set; } = false;
@@ -558,8 +565,8 @@ public Dictionary<uint, GameObject> GetSurfaceObjects()
             return new Dictionary<uint, GameObject>(0);
         }
 
-        #endregion Surface Finding Handling implementation
+#endregion Surface Finding Handling implementation
 
-        #endregion IMixedRealitySpatialAwarenessSystem Implementation
+#endregion IMixedRealitySpatialAwarenessSystem Implementation
     }
 }

Assets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/IMixedRealitySpatialAwarenessPlanarSurfaceDescription.cs

@@ -23,6 +23,6 @@ public interface IMixedRealitySpatialAwarenessPlanarSurfaceDescription : IMixedR
         /// <summary>
         /// The semantic (ex: Floor) associated with the surface.
         /// </summary>
-        MixedRealitySpatialAwarenessSurfaceTypes SurfaceType { get; }
+        SpatialAwarenessSurfaceTypes SurfaceType { get; }
     }
 }

Assets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/MixedRealitySpatialAwarenessProfile.cs

@@ -65,12 +65,12 @@ public class MixedRealitySpatialAwarenessProfile : ScriptableObject
 
         [SerializeField]
         [Tooltip("Level of detail for the mesh")]
-        private MixedRealitySpatialAwarenessMeshLevelOfDetail meshLevelOfDetail = MixedRealitySpatialAwarenessMeshLevelOfDetail.Coarse;
+        private SpatialAwarenessMeshLevelOfDetail meshLevelOfDetail = SpatialAwarenessMeshLevelOfDetail.Coarse;
 
         /// <summary>
         /// The desired Unity Physics Layer on which to set the spatial mesh.
         /// </summary>
-        public MixedRealitySpatialAwarenessMeshLevelOfDetail MeshLevelOfDetail => meshLevelOfDetail;
+        public SpatialAwarenessMeshLevelOfDetail MeshLevelOfDetail => meshLevelOfDetail;
 
         [SerializeField]
         [Tooltip("Level of detail, in triangles per cubic meter.\nIgnored unless MeshLevelOfDetail is set to Custom.")]

…MixedRealitySpatialAwarenessEventType.cs …alAwareness/SpatialAwarenessEventType.csAssets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/MixedRealitySpatialAwarenessEventType.cs renamed to Assets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/SpatialAwarenessEventType.cs Assets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/MixedRealitySpatialAwarenessEventType.cs renamed to Assets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/SpatialAwarenessEventType.cs

@@ -6,7 +6,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.SpatialAwarenessSystem
     /// <summary>
     /// Enumeration defining the types of events that spatial awareness subsystems will send.
     /// </summary>
-    public enum MixedRealitySpatialAwarenessEventType
+    public enum SpatialAwarenessEventType
     {
         /// <summary>
         /// A spatial awareness subsystem is reporting that a new spatial element 

…RealitySpatialAwarenessEventType.cs.meta …reness/SpatialAwarenessEventType.cs.metaAssets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/MixedRealitySpatialAwarenessEventType.cs.meta renamed to Assets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/SpatialAwarenessEventType.cs.meta Assets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/MixedRealitySpatialAwarenessEventType.cs.meta renamed to Assets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/SpatialAwarenessEventType.cs.meta

@@ -9,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.SpatialAwarenessSystem
     /// <remarks>
     /// The integral values for these levels of detail generally map to triangle density, in triangles per cubic meter.
     /// /remarks>
-    public enum MixedRealitySpatialAwarenessMeshLevelOfDetail
+    public enum SpatialAwarenessMeshLevelOfDetail
     {
         /// <summary>
         /// The custom level of detail allows specifying a custom value for

…litySpatialAwarenessMeshLevelOfDetail.cs …ess/SpatialAwarenessMeshLevelOfDetail.csAssets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/MixedRealitySpatialAwarenessMeshLevelOfDetail.cs renamed to Assets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/SpatialAwarenessMeshLevelOfDetail.cs Assets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/MixedRealitySpatialAwarenessMeshLevelOfDetail.cs renamed to Assets/MixedRealityToolkit/_Core/Definitions/SpatialAwareness/SpatialAwarenessMeshLevelOfDetail.cs

@@ -6,27 +6,28 @@ namespace Microsoft.MixedReality.Toolkit.Core.Definitions.SpatialAwarenessSystem
     /// <summary>
     /// Enumeration defining the types of planar surfaces that are supported by the spatial awareness surface finding subsystem.
     /// </summary>
-    public enum MixedRealitySpatialAwarenessSurfaceTypes
+    [System.Flags]
+    public enum SpatialAwarenessSurfaceTypes
     {
         /// <summary>
         /// An unknown / unsupported type of surface.
         /// </summary>
-        Unknown = 0,
+        Unknown = 1 << 0,
 
         /// <summary>
         /// The environment’s floor.
         /// </summary>
-        Floor,
+        Floor = 1 << 1,
 
         /// <summary>
         /// The environment’s ceiling.
         /// </summary>
-        Ceiling,
+        Ceiling = 1 << 2,
 
         /// <summary>
         /// A wall within the user’s space.
         /// </summary>
-        Wall,
+        Wall = 1 << 3,
 
         /// <summary>
         /// A raised, horizontal surface such as a shelf.
@@ -35,6 +36,6 @@ public enum MixedRealitySpatialAwarenessSurfaceTypes
         /// Platforms, like floors, that can be used for placing objects
         /// requiring a horizontal surface.
         /// </remarks>
-        Platform
+        Platform = 1 << 4
     }
 }