Merge branch 'main' of https://github.com/microsoft/MixedRealityToolkit-Unity into ExamplesHub_260_MergeMain

# Conflicts:
#	Assets/MRTK/Examples/Experimental/SceneUnderstanding/Scenes/SceneUnderstandingExample.unity

Author: cre8ivepark

Assets/MRTK/Core/Attributes/ExperimentalAttribute.cs

@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-using UnityEngine;
+
 using System;
+using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit
 {

Assets/MRTK/Core/Attributes/HelpAttribute.cs

@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-using UnityEngine;
+
 using System;
+using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit
 {

Assets/MRTK/Core/Attributes/TagPropertyAttribute.cs

@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-using UnityEngine;
+
 using System;
+using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit
 {

Assets/MRTK/Core/Definitions/BoundarySystem/MixedRealityBoundaryVisualizationProfile.cs

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using Microsoft.MixedReality.Toolkit.Physics;
 using Microsoft.MixedReality.Toolkit.Utilities;
 using UnityEngine;
-using Microsoft.MixedReality.Toolkit.Physics;
 
 namespace Microsoft.MixedReality.Toolkit.Boundary
 {

Assets/MRTK/Core/Definitions/Devices/ArticulatedHandDefinition.cs

@@ -59,7 +59,7 @@ public float EnterPinchDistance
                 else
                 {
                     Debug.LogError("EnterPinchDistance must be between 0.015 and 0.1, please change Enter Pinch Distance in the Leap Motion Device Manager Profile");
-                }   
+                }
             }
         }
 
@@ -115,7 +115,7 @@ public MixedRealityInteractionMapping[] DefaultInteractions
             new MixedRealityInputActionMapping("Spatial Pointer", AxisType.SixDof, DeviceInputType.SpatialPointer),
             new MixedRealityInputActionMapping("Spatial Grip", AxisType.SixDof, DeviceInputType.SpatialGrip),
             new MixedRealityInputActionMapping("Select", AxisType.Digital, DeviceInputType.Select),
-            new MixedRealityInputActionMapping("Grab", AxisType.SingleAxis, DeviceInputType.TriggerPress),
+            new MixedRealityInputActionMapping("Grab", AxisType.SingleAxis, DeviceInputType.GripPress),
             new MixedRealityInputActionMapping("Index Finger Pose", AxisType.SixDof, DeviceInputType.IndexFinger),
             new MixedRealityInputActionMapping("Teleport Pose", AxisType.DualAxis, DeviceInputType.ThumbStick),
         };

Assets/MRTK/Core/Definitions/Devices/MixedRealityControllerVisualizationSetting.cs

@@ -21,6 +21,7 @@ public struct MixedRealityControllerVisualizationSetting
         /// <param name="controllerType">Controller Type to instantiate at runtime.</param>
         /// <param name="handedness">The designated hand that the device is managing.</param>
         /// <param name="overrideModel">The controller model prefab to be rendered.</param>
+        [Obsolete("This constructor doesn't need to be called directly.")]
         public MixedRealityControllerVisualizationSetting(string description, Type controllerType, Handedness handedness = Handedness.None, GameObject overrideModel = null) : this()
         {
             this.description = description;

Assets/MRTK/Core/Definitions/Devices/MixedRealityEyeTrackingProfile.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using Microsoft.MixedReality.Toolkit.Input;
 using Microsoft.MixedReality.Toolkit.Utilities;
 using System;
 using UnityEngine;

Assets/MRTK/Core/Definitions/Devices/OculusTouchControllerDefinition.cs

@@ -16,7 +16,7 @@ public class OculusTouchControllerDefinition : BaseInputSourceDefinition
         /// <param name="handedness">The handedness that this definition instance represents.</param>
         public OculusTouchControllerDefinition(Handedness handedness) : base(handedness)
         {
-            if ((handedness != Handedness.Left) && 
+            if ((handedness != Handedness.Left) &&
                 (handedness != Handedness.Right))
             {
                 throw new System.ArgumentException($"Unsupported Handedness ({handedness}). The OculusTouchControllerDefinition supports Left and Right.");

Assets/MRTK/Core/Definitions/InputSystem/AnimatedCursorData.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using Microsoft.MixedReality.Toolkit.Utilities;
+using System;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.Input

Assets/MRTK/Core/Definitions/InputSystem/MixedRealityRaycastHit.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.Input