Merge branch 'issue/6986' of https://github.com/microsoft/MixedRealityToolkit-Unity into issue/6986

Author: Julia Schwarz

Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Scenes/HandInteractionExamples.unity

@@ -1,11 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System.Collections.Generic;
 using Microsoft.MixedReality.Toolkit.SpatialAwareness;
 using Microsoft.MixedReality.Toolkit.Utilities;
 using UnityEngine;
-using UnityEngine.EventSystems;
 
 namespace Microsoft.MixedReality.Toolkit.SpatialObjectMeshObserver
 {
@@ -19,9 +17,8 @@ namespace Microsoft.MixedReality.Toolkit.SpatialObjectMeshObserver
         "ObjectMeshObserver/Profiles/DefaultObjectMeshObserverProfile.asset",
         "MixedRealityToolkit.Providers")]
     [HelpURL("https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/SpatialAwareness/SpatialAwarenessGettingStarted.html")]
-    public class SpatialObjectMeshObserver : 
-        BaseSpatialObserver, 
-        IMixedRealitySpatialAwarenessMeshObserver, 
+    public class SpatialObjectMeshObserver :
+        BaseSpatialMeshObserver,
         IMixedRealityCapabilityCheck
     {
         /// <summary>
@@ -59,36 +56,24 @@ public SpatialObjectMeshObserver(
 
         private GameObject spatialMeshObject = null;
 
-        private MixedRealitySpatialAwarenessEventData<SpatialAwarenessMeshObject> meshEventData = null;
+        #region BaseSpatialMeshObserver Implementation
 
         /// <summary>
         /// Reads the settings from the configuration profile.
         /// </summary>
-        private void ReadProfile()
+        protected override void ReadProfile()
         {
+            base.ReadProfile();
+
             SpatialObjectMeshObserverProfile profile = ConfigurationProfile as SpatialObjectMeshObserverProfile;
             if (profile == null) { return; }
 
             // SpatialObjectMeshObserver settings
             spatialMeshObject = profile.SpatialMeshObject;
-
-            // IMixedRealitySpatialAwarenessObserver settings
-            StartupBehavior = profile.StartupBehavior;
-            IsStationaryObserver = profile.IsStationaryObserver;
-            ObservationExtents = profile.ObservationExtents;
-            ObserverVolumeType = profile.ObserverVolumeType;
-            UpdateInterval = profile.UpdateInterval;
-
-            // IMixedRealitySpatialAwarenessMeshObserver settings
-            DisplayOption = profile.DisplayOption;
-            LevelOfDetail = profile.LevelOfDetail;
-            MeshPhysicsLayer = profile.MeshPhysicsLayer;
-            OcclusionMaterial = profile.OcclusionMaterial;
-            RecalculateNormals = profile.RecalculateNormals;
-            TrianglesPerCubicMeter = profile.TrianglesPerCubicMeter;
-            VisibleMaterial = profile.VisibleMaterial;
         }
 
+        #endregion BaseSpatialMeshObserver Implementation
+
         #region IMixedRealityCapabilityCheck Implementation
 
         /// <inheritdoc />
@@ -101,19 +86,6 @@ bool IMixedRealityCapabilityCheck.CheckCapability(MixedRealityCapability capabil
 
         #region IMixedRealityDataProvider Implementation
 
-        /// <inheritdoc />
-        public override void Initialize()
-        {
-            meshEventData = new MixedRealitySpatialAwarenessEventData<SpatialAwarenessMeshObject>(EventSystem.current);
-
-            ReadProfile();
-
-            if (StartupBehavior == AutoStartBehavior.AutoStart)
-            {
-                Resume();
-            }
-        }
-
         /// <inheritdoc />
         public override void Update()
         {
@@ -125,29 +97,32 @@ public override void Update()
             SendMeshObjects();
         }
 
+        #endregion IMixedRealityDataProvider Implementation
+
+        #region BaseSpatialObserver Implementation
+
         /// <inheritdoc />
-        public override void Reset()
+        protected override void CreateObserver()
         {
-            CleanupObserver();
-            Initialize();
+            if (StartupBehavior == AutoStartBehavior.AutoStart)
+            {
+                Resume();
+            }
         }
 
         /// <inheritdoc />
-        public override void Destroy()
+        protected override void CleanupObserver()
         {
-            Disable();
-            CleanupObserver();
+            if (IsRunning)
+            {
+                Suspend();
+            }
         }
 
-        #endregion IMixedRealityDataProvider Implementation
+        #endregion BaseSpatialObserver Implementation
 
         #region IMixedRealitySpatialAwarenessObserver Implementation
 
-        private GameObject observedObjectParent = null;
-
-        /// <inheritdoc />
-        protected virtual GameObject ObservedObjectParent => observedObjectParent != null ? observedObjectParent : (observedObjectParent = SpatialAwarenessSystem?.CreateSpatialAwarenessObservationParent(Name));
-
         /// <inheritdoc />
         public override void ClearObservations()
         {
@@ -166,32 +141,26 @@ public override void ClearObservations()
             sendObservations = true;
         }
 
-        private int currentMeshId = 0;
-
         /// <inheritdoc />
         public override void Resume()
         {
             if (IsRunning) { return; }
             IsRunning = true;
         }
 
-        /// <summary>
-        /// Event sent whenever a mesh is added.
-        /// </summary>
-        private static readonly ExecuteEvents.EventFunction<IMixedRealitySpatialAwarenessObservationHandler<SpatialAwarenessMeshObject>> OnMeshAdded =
-            delegate (IMixedRealitySpatialAwarenessObservationHandler<SpatialAwarenessMeshObject> handler, BaseEventData eventData)
-            {
-                MixedRealitySpatialAwarenessEventData<SpatialAwarenessMeshObject> spatialEventData = ExecuteEvents.ValidateEventData<MixedRealitySpatialAwarenessEventData<SpatialAwarenessMeshObject>>(eventData);
-                handler.OnObservationAdded(spatialEventData);
-            };
-
         /// <inheritdoc />
         public override void Suspend()
         {
             if (!IsRunning) { return; }
             IsRunning = false;
         }
 
+        #endregion IMixedRealitySpatialAwarenessObserver Implementation
+
+        #region Helpers
+        
+        private int currentMeshId = 0;
+
         /// <summary>
         /// Sends the observations using the mesh data contained within the configured 3D model.
         /// </summary>
@@ -233,9 +202,7 @@ private void SendMeshObjects()
         /// </summary>
         private void RemoveMeshObject(int meshId)
         {
-            SpatialAwarenessMeshObject meshObject = null;
-
-            if (meshes.TryGetValue(meshId, out meshObject))
+            if (meshes.TryGetValue(meshId, out SpatialAwarenessMeshObject meshObject))
             {
                 // Remove the mesh object from the collection.
                 meshes.Remove(meshId);
@@ -250,128 +217,6 @@ private void RemoveMeshObject(int meshId)
             }
         }
 
-        /// <summary>
-        /// Event sent whenever a mesh is discarded.
-        /// </summary>
-        private static readonly ExecuteEvents.EventFunction<IMixedRealitySpatialAwarenessObservationHandler<SpatialAwarenessMeshObject>> OnMeshRemoved =
-            delegate (IMixedRealitySpatialAwarenessObservationHandler<SpatialAwarenessMeshObject> handler, BaseEventData eventData)
-            {
-                MixedRealitySpatialAwarenessEventData<SpatialAwarenessMeshObject> spatialEventData = ExecuteEvents.ValidateEventData<MixedRealitySpatialAwarenessEventData<SpatialAwarenessMeshObject>>(eventData);
-                handler.OnObservationRemoved(spatialEventData);
-            };
-
-        #endregion IMixedRealitySpatialAwarenessObserver Implementation
-
-        #region IMixedRealitySpatialAwarenessMeshObserver Implementation
-
-        private SpatialAwarenessMeshDisplayOptions displayOption = SpatialAwarenessMeshDisplayOptions.Visible;
-        
-        /// <inheritdoc />
-        public SpatialAwarenessMeshDisplayOptions DisplayOption
-        {
-            get => displayOption;
-
-            set
-            {
-                displayOption = value;
-                ApplyUpdatedMeshDisplayOption(displayOption);
-            }
-        }
-
-        /// <inheritdoc />
-        public SpatialAwarenessMeshLevelOfDetail LevelOfDetail { get; set; } = SpatialAwarenessMeshLevelOfDetail.Coarse;
-
-        private Dictionary<int, SpatialAwarenessMeshObject> meshes = new Dictionary<int, SpatialAwarenessMeshObject>();
-
-        /// <inheritdoc />
-        public IReadOnlyDictionary<int, SpatialAwarenessMeshObject> Meshes => new Dictionary<int, SpatialAwarenessMeshObject>(meshes);
-
-        private int meshPhysicsLayer = 31;
-
-        /// <inheritdoc />
-        public int MeshPhysicsLayer
-        {
-            get => meshPhysicsLayer;
-
-            set
-            {
-                if ((value < 0) || (value > 31))
-                {
-                    Debug.LogError("Specified MeshPhysicsLayer is out of bounds. Please set a value between 0 and 31, inclusive.");
-                    return;
-                }
-                
-                meshPhysicsLayer = value;
-
-                ApplyUpdatedPhysicsLayer();
-            }
-        }
-
-        /// <inheritdoc />
-        public int MeshPhysicsLayerMask => (1 << MeshPhysicsLayer);
-
-        /// <inheritdoc />
-        public bool RecalculateNormals { get; set; } = true;
-
-        /// <inheritdoc />
-        public int TrianglesPerCubicMeter { get; set; } = 0;
-
-        private Material occlusionMaterial = null;
-
-        /// <inheritdoc />
-        public Material OcclusionMaterial
-        {
-            get => occlusionMaterial;
-
-            set
-            {
-                if (value != occlusionMaterial)
-                {
-                    occlusionMaterial = value;
-
-                    if (DisplayOption == SpatialAwarenessMeshDisplayOptions.Occlusion)
-                    {
-                        ApplyUpdatedMeshDisplayOption(SpatialAwarenessMeshDisplayOptions.Occlusion);
-                    }
-                }
-            }
-        }
-
-
-        private Material visibleMaterial = null;
-
-        /// <inheritdoc />
-        public Material VisibleMaterial
-        {
-            get => visibleMaterial;
-
-            set
-            {
-                if (value != visibleMaterial)
-                {
-                    visibleMaterial = value;
-
-                    if (DisplayOption == SpatialAwarenessMeshDisplayOptions.Visible)
-                    {
-                        ApplyUpdatedMeshDisplayOption(SpatialAwarenessMeshDisplayOptions.Visible);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Stop the observer and releases resources.
-        /// </summary>
-        private void CleanupObserver()
-        {
-            if (IsRunning)
-            {
-                Suspend();
-            }
-
-            ClearObservations();
-        }
-
         /// <summary>
         /// Applies the appropriate material, based on the current of the <see cref="SpatialAwarenessMeshDisplayOptions"/> property. 
         /// </summary>
@@ -392,45 +237,6 @@ private void ApplyMeshMaterial(SpatialAwarenessMeshObject meshObject)
             meshObject.Renderer.enabled = enable;
         }
 
-        /// <summary>
-        /// Updates the material for each observed mesh,.
-        /// </summary>
-        /// <param name="option">
-        /// The <see cref="SpatialAwarenessMeshDisplayOptions"/> value to be used to determine the appropriate material.
-        /// </param>
-        private void ApplyUpdatedMeshDisplayOption(SpatialAwarenessMeshDisplayOptions option)
-        {
-            bool enable = (option != SpatialAwarenessMeshDisplayOptions.None);
-
-            foreach (SpatialAwarenessMeshObject meshObject in Meshes.Values)
-            {
-                if ((meshObject?.Renderer == null)) { continue; }
-
-                if (enable)
-                {
-                    meshObject.Renderer.sharedMaterial = (option == SpatialAwarenessMeshDisplayOptions.Visible) ?
-                        VisibleMaterial :
-                        OcclusionMaterial;
-                }
-
-                meshObject.Renderer.enabled = enable;
-            }
-        }
-
-        /// <summary>
-        /// Updates the mesh physics layer for current mesh observations.
-        /// </summary>
-        private void ApplyUpdatedPhysicsLayer()
-        {
-            foreach (SpatialAwarenessMeshObject meshObject in Meshes.Values)
-            {
-                if (meshObject?.GameObject == null) { continue; }
-
-                meshObject.GameObject.layer = MeshPhysicsLayer;
-
-            }
-        }
-
-        #endregion IMixedRealitySpatialAwarenessMeshObserver Implementation
+        #endregion Helpers
     }
 }

Assets/MixedRealityToolkit.Examples/Demos/UX/Slider/Scenes/SliderExample.unity

@@ -149,13 +149,7 @@ protected override void RemoveController(string joystickName)
 
             if (controller != null)
             {
-                foreach (IMixedRealityPointer pointer in controller.InputSource.Pointers)
-                {
-                    if (pointer != null)
-                    {
-                        pointer.Controller = null;
-                    }
-                }
+                RecyclePointers(controller.InputSource);
 
                 if (controller.Visualizer != null &&
                     controller.Visualizer.GameObjectProxy != null)

Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/SpatialObjectMeshObserver.cs

@@ -24,12 +24,12 @@ public struct HolographicFrameNativeData
         public uint MaxNumberOfCameras;
 
         /// <summary>
-        /// The current native root <see href="https://docs.microsoft.com/uwp/api/windows.perception.spatial.spatialcoordinatesystem">ISpatialCoordinateSystem</see>).
+        /// The current native root <see href="https://docs.microsoft.com/uwp/api/windows.perception.spatial.spatialcoordinatesystem">ISpatialCoordinateSystem</see>.
         /// </summary>
         public IntPtr ISpatialCoordinateSystemPtr;
 
         /// <summary>
-        /// The current native <see href="https://docs.microsoft.com/uwp/api/Windows.Graphics.Holographic.HolographicFrame">IHolographicFrame</see>).
+        /// The current native <see href="https://docs.microsoft.com/uwp/api/Windows.Graphics.Holographic.HolographicFrame">IHolographicFrame</see>.
         /// </summary>
         public IntPtr IHolographicFramePtr;