Merge pull request #3421 from Microsoft/beta2-stabilization

Beta2 stabilization -> mrtk development

Author: David Kline

Assets/MixedRealityToolkit.Examples/Demos/Solvers/Prefabs/SolverSwappingVolume.prefab

@@ -245,6 +245,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: edea428b5e02f9144b45b9fbd5ba5278, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  selectAction:
+    id: 1
+    description: Select
+    axisConstraint: 2
   hideThisObject: {fileID: 0}
   spawnThisPrefab: {fileID: 0}
   updateSolverTargetToClickSource: 1

Assets/MixedRealityToolkit.Examples/Demos/Solvers/Scripts/SwapVolume.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using Microsoft.MixedReality.Toolkit.Core.Definitions.InputSystem;
 using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
 using Microsoft.MixedReality.Toolkit.Core.EventDatum.Input;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem.Handlers;
@@ -15,6 +16,10 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos
     /// </summary>
     public class SwapVolume : MonoBehaviour, IMixedRealityPointerHandler
     {
+        [SerializeField]
+        [Tooltip("The action to activate or deactivate the swapping volume.")]
+        private MixedRealityInputAction selectAction = MixedRealityInputAction.None;
+
         [SerializeField]
         [Tooltip("The scene object to be hidden when the active solver is enabled.")]
         private GameObject hideThisObject = null;
@@ -53,6 +58,11 @@ public void OnPointerDown(MixedRealityPointerEventData eventData) { }
 
         public void OnPointerClicked(MixedRealityPointerEventData eventData)
         {
+            if (eventData.MixedRealityInputAction != selectAction)
+            {
+                return;
+            }
+
             if (spawnedObject.activeSelf)
             {
                 spawnedObject.SetActive(false);
@@ -72,6 +82,10 @@ public void OnPointerClicked(MixedRealityPointerEventData eventData)
                     {
                         solverHandler.TrackedObjectToReference = TrackedObjectType.MotionControllerLeft;
                     }
+                    else
+                    {
+                        solverHandler.TrackedObjectToReference = TrackedObjectType.Head;
+                    }
                 }
 
                 hideThisObject.SetActive(false);

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealitySpatialMeshObserver.cs

@@ -304,10 +304,11 @@ private void CleanupObserver()
             if (Application.isPlaying)
             {
                 // Cleanup the scene objects are managing
-                if (ObservedObjectParent != null)
+                if (observedObjectParent != null)
                 {
-                    ObservedObjectParent.transform.DetachChildren();
+                    observedObjectParent.transform.DetachChildren();
                 }
+                
                 foreach (SpatialAwarenessMeshObject meshObject in meshes.Values)
                 {
                     if (meshObject != null)