complete profile, small interface changes

Author: David Kline (ANALOG)

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

@@ -482,10 +482,13 @@ public int MeshTrianglesPerCubicMeter
         public bool MeshRecalculateNormals { get; set; } = true;
 
         /// <inheritdoc />
-        public bool DisplayMeshes { get; set; } = false;
+        public SpatialMeshDisplayOptions MeshDisplayOption { get; set; } = SpatialMeshDisplayOptions.None;
 
         /// <inheritdoc />
-        public Material MeshMaterial { get; set; } = null;
+        public Material MeshVisibleMaterial { get; set; } = null;
+
+        /// <inheritdoc />
+        public Material MeshOcclusionMaterial { get; set; } = null;
 
         /// <inheritdoc />
         public Dictionary<uint, IMixedRealitySpatialAwarenessMeshDescription> GetMeshes()

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityConfigurationProfile.asset

@@ -11,11 +11,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7612acbc1a4a4ed0afa5f4ccbe42bee4, type: 3}
   m_Name: DefaultMixedRealityConfigurationProfile
   m_EditorClassIdentifier: 
-  initialManagerTypes:
-  - reference: Microsoft.MixedReality.Toolkit.SDK.Input.MixedRealityInputManager,
-      Microsoft.MixedReality.Toolkit.SDK
-  - reference: Microsoft.MixedReality.Toolkit.SDK.BoundarySystem.MixedRealityBoundaryManager,
-      Microsoft.MixedReality.Toolkit.SDK
+  initialManagerTypes: []
   targetExperienceScale: 3
   enableCameraProfile: 1
   cameraProfile: {fileID: 11400000, guid: 8089ccfdd4494cd38f676f9fc1f46a04, type: 2}
@@ -53,5 +49,5 @@ MonoBehaviour:
   spatialAwarenessSystemType:
     reference: Microsoft.MixedReality.Toolkit.SDK.SpatialAwarenessSystem.MixedRealitySpatialAwarenessSystem,
       Microsoft.MixedReality.Toolkit.SDK
-  spatialAwarenessProfile: {fileID: 11400000, guid: fe3d98567cf77744ba16af55bdec08ed,
+  spatialAwarenessProfile: {fileID: 11400000, guid: 2a33d8426496c874ab1550069b7ccef8,
     type: 2}

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealitySpatialAwarenessProfile.asset

@@ -19,5 +19,21 @@ MonoBehaviour:
   meshLevelOfDetail: 0
   meshTrianglesPerCubicMeter: 0
   meshRecalculateNormals: 1
-  displayMeshes: 0
+  meshDisplayOption: 0
   meshMaterial: {fileID: 2100000, guid: a923a5d1aebc7fe449b4ab3289da537b, type: 2}
+  meshOcclusionMaterial: {fileID: 2100000, guid: a809c7ea182b699409443d46d5b42435,
+    type: 2}
+  useSurfaceFindingSystem: 1
+  surfaceFindingPhysicsLayer: 31
+  surfaceFindingMinimumArea: 0.025
+  displayFloorSurfaces: 0
+  floorSurfaceMaterial: {fileID: 2100000, guid: 47f3c5e1cb6142ba9697cd4c86d74321,
+    type: 2}
+  displayCeilingSurfaces: 0
+  ceilingSurfaceMaterial: {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6,
+    type: 2}
+  displayWallSurfaces: 0
+  wallSurfaceMaterial: {fileID: 2100000, guid: 3c55769e893c4f4c8c51b7fa69bee2b9, type: 2}
+  displayPlatformSurfaces: 0
+  platformSurfaceMaterial: {fileID: 2100000, guid: cb74390ea57642f8b5ca0aa8f5fb38c1,
+    type: 2}

Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealitySpatialAwarenessProfile.asset.meta

@@ -7,7 +7,7 @@ Material:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: MRTK_Occlusion
-  m_Shader: {fileID: 4800000, guid: bece293ca0f6595439e878a63a5ec3bf, type: 3}
+  m_Shader: {fileID: 15300, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: ETC1_EXTERNAL_ALPHA
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0

Assets/MixedRealityToolkit-SDK/StandardAssets/Materials/MRTK_Occlusion.mat

@@ -37,7 +37,7 @@ public class MixedRealitySpatialAwarenessProfile : ScriptableObject
         private float updateInterval = 3.5f;
 
         /// <summary>
-        /// Rhe frequency, in seconds, at which the spatial observer updates.
+        /// The frequency, in seconds, at which the spatial observer updates.
         /// </summary>
         public float UpdateInterval => updateInterval;
 
@@ -93,13 +93,13 @@ public class MixedRealitySpatialAwarenessProfile : ScriptableObject
         public bool MeshRecalculateNormals => meshRecalculateNormals;
 
         [SerializeField]
-        [Tooltip("Automatically display spatial meshes?")]
-        private bool displayMeshes = false;
+        [Tooltip("How should spatial meshes be displayed?")]
+        private SpatialMeshDisplayOptions meshDisplayOption = SpatialMeshDisplayOptions.None;
 
         /// <summary>
-        /// Indicates if the mesh subsystem is to automatically display surface meshes within the application.
+        /// Indicates how the mesh subsystem is to display surface meshes within the application.
         /// </summary>
-        public bool DisplayMeshes => displayMeshes;
+        public SpatialMeshDisplayOptions MeshDisplayOption => meshDisplayOption;
 
         [SerializeField]
         [Tooltip("Material to use when displaying meshes")]
@@ -110,11 +110,117 @@ public class MixedRealitySpatialAwarenessProfile : ScriptableObject
         /// </summary>
         public Material MeshMaterial => meshMaterial;
 
+        [SerializeField]
+        [Tooltip("Material to use when spatial meshes should occlude other objects")]
+        private Material meshOcclusionMaterial = null;
+
+        /// <summary>
+        /// The material to be used when spatial meshes should occlude other objects.
+        /// </summary>
+        public Material MeshOcclusionMaterial => meshOcclusionMaterial;
+
         #endregion Mesh settings
 
         #region Surface Finding settings
 
-        // todo
+        [SerializeField]
+        [Tooltip("Is the surface finding subsystem in use?")]
+        private bool useSurfaceFindingSystem = true;
+
+        /// <summary>
+        /// Indicates if the surface finding subsystem is in use by the application.
+        /// </summary>
+        public bool UseSurfaceFindingSystem => useSurfaceFindingSystem;
+
+        [SerializeField]
+        [Tooltip("Physics layer on which to set the planar surfaces")]
+        private int surfaceFindingPhysicsLayer = 31;
+
+        /// <summary>
+        /// The desired Unity Physics Layer on which to set the planar surfaces.
+        /// </summary>
+        public int SurfaceFindingPhysicsLayer => surfaceFindingPhysicsLayer;
+
+        [SerializeField]
+        [Tooltip("The minimum area, in square meters, of the planar surfaces")]
+        private float surfaceFindingMinimumArea = 0.025f;
+
+        /// <summary>
+        /// The minimum area, in square meters, of the planar surfaces.
+        /// </summary>
+        public float SurfaceFindingMinimumArea => surfaceFindingMinimumArea;
+
+        [SerializeField]
+        [Tooltip("Automatically display floor surfaces?")]
+        private bool displayFloorSurfaces = false;
+
+        /// <summary>
+        /// Indicates if the surface finding subsystem is to automatically display floor surfaces within the application.
+        /// </summary>
+        public bool DisplayFloorSurfaces => displayFloorSurfaces;
+
+        [SerializeField]
+        [Tooltip("Material to use when displaying floor surfaces")]
+        private Material floorSurfaceMaterial = null;
+
+        /// <summary>
+        /// The material to be used when automatically displaying floor surfaces.
+        /// </summary>
+        public Material FloorSurfaceMaterial => floorSurfaceMaterial;
+
+        [SerializeField]
+        [Tooltip("Automatically display ceiling surfaces?")]
+        private bool displayCeilingSurfaces = false;
+
+        /// <summary>
+        /// Indicates if the surface finding subsystem is to automatically display ceiling surfaces within the application.
+        /// </summary>
+        public bool DisplayCeilingSurface => displayCeilingSurfaces;
+
+        [SerializeField]
+        [Tooltip("Material to use when displaying ceiling surfaces")]
+        private Material ceilingSurfaceMaterial = null;
+
+        /// <summary>
+        /// The material to be used when automatically displaying ceiling surfaces.
+        /// </summary>
+        public Material CeilingSurfaceMaterial => ceilingSurfaceMaterial;
+
+        [SerializeField]
+        [Tooltip("Automatically display wall surfaces?")]
+        private bool displayWallSurfaces = false;
+
+        /// <summary>
+        /// Indicates if the surface finding subsystem is to automatically display wall surfaces within the application.
+        /// </summary>
+        public bool DisplayWallSurface => displayWallSurfaces;
+
+        [SerializeField]
+        [Tooltip("Material to use when displaying wall surfaces")]
+        private Material wallSurfaceMaterial = null;
+
+        /// <summary>
+        /// The material to be used when automatically displaying wall surfaces.
+        /// </summary>
+        public Material WallSurfaceMaterial => wallSurfaceMaterial;
+
+        [SerializeField]
+        [Tooltip("Automatically display platform surfaces?")]
+        private bool displayPlatformSurfaces = false;
+
+        /// <summary>
+        /// Indicates if the surface finding subsystem is to automatically display platform surfaces within the application.
+        /// </summary>
+        public bool DisplayPlatformSurfaces => displayPlatformSurfaces;
+
+        [SerializeField]
+        [Tooltip("Material to use when displaying platform surfaces")]
+        private Material platformSurfaceMaterial = null;
+
+        /// <summary>
+        /// The material to be used when automatically displaying platform surfaces.
+        /// </summary>
+        public Material PlatformSurfaceMaterial => platformSurfaceMaterial;
 
         #endregion Surface Finding settings
     }

Assets/MixedRealityToolkit-SDK/StandardAssets/Shaders/MRTK_Occlusion.shader

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+namespace Microsoft.MixedReality.Toolkit.Core.Definitions.SpatialAwarenessSystem
+{
+    /// <summary>
+    /// Options for how the spatial mesh is to be displayed by the spatial awareness system.
+    /// </summary>
+    public enum SpatialMeshDisplayOptions
+    {
+        /// <summary>
+        /// Do not display the spatial mesh
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Display the spatial mesh using the configured material
+        /// </summary>
+        Visible,
+
+        /// <summary>
+        /// Display the spatial mesh using the configured occlusion material
+        /// </summary>
+        Occlusion
+    }
+}