Merge branch 'mrtk_development' into users/trferrel/profile-inspector-reduce

# Conflicts:
#	Assets/MixedRealityToolkit/Inspectors/Utilities/MixedRealityInspectorUtility.cs

Author: Troy-Ferrell

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-03-Navigation.unity

@@ -10209,7 +10209,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "                                  ***\n<size=2.9><color=#78A2C8>https://www.microsoft.com/en-us/hololens/</color></size>\nThe
+  m_text: "                                  ***\n<size=2.9><color=#78A2C8>https://www.microsoft.com/hololens/</color></size>\nThe
     <b>HoloLens</b> is a head-mounted display unit connected to an adjustable, cushioned
     inner headband, which can tilt HoloLens up and down, as well as forward and backward.
     To wear the unit, the user fits the HoloLens on their head, using an adjustment

Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Script/LaunchUri.cs

@@ -13,7 +13,7 @@ public class LaunchUri : MonoBehaviour
         /// Launch a UWP slate app. In most cases, your experience can continue running while the
         /// launched app renders on top.
         /// </summary>
-        /// <param name="uri">Url of the web page or app to launch. See https://docs.microsoft.com/en-us/windows/uwp/launch-resume/launch-default-app
+        /// <param name="uri">Url of the web page or app to launch. See https://docs.microsoft.com/windows/uwp/launch-resume/launch-default-app
         /// for more information about the protocols that can be used when launching apps.</param>
         public void Launch(string uri)
         {

Assets/MixedRealityToolkit.Providers/ObjectMeshObserver/SpatialObjectMeshObserverProfileInspector.cs

@@ -76,7 +76,7 @@ public override void OnInspectorGUI()
                 return;
             }
 
-            using (new GUIEnabledWrapper(!IsProfileLock((BaseMixedRealityProfile)target)))
+            using (new EditorGUI.DisabledGroupScope(IsProfileLock((BaseMixedRealityProfile)target)))
             {
                 serializedObject.Update();
 

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Definitions/HolographicFrameNativeData.cs

@@ -9,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality
     /// <summary>
     /// A representation of Windows Mixed Reality native data, provided as an IntPtr from Unity's UnityEngine.XR.XRDevice.GetNativePtr().
     /// </summary>
-    /// <remarks>See <see href="https://docs.microsoft.com/en-us/windows/mixed-reality/unity-xrdevice-advanced"/> for more info.</remarks>
+    /// <remarks>See <see href="https://docs.microsoft.com/windows/mixed-reality/unity-xrdevice-advanced"/> for more info.</remarks>
     [StructLayout(LayoutKind.Sequential)]
     public struct HolographicFrameNativeData
     {

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Editor/WindowsMixedRealityCameraSettingsProfileInspector.cs

@@ -21,8 +21,8 @@ public class WindowsMixedRealityCameraSettingsProfileInspector : BaseMixedRealit
         private readonly GUIContent pvCameraRenderingTitle = new GUIContent("Render from PV Camera (Align holograms)");
         private readonly GUIContent reprojectionMethodTitle = new GUIContent("HoloLens 2 Reprojection Method");
 
-        private const string MRCDocURL = "https://docs.microsoft.com/en-us/windows/mixed-reality/mixed-reality-capture-for-developers#render-from-the-pv-camera-opt-in";
-        private const string DepthReprojectionDocURL = "https://docs.microsoft.com/en-us/windows/mixed-reality/hologram-stability#reprojection";
+        private const string MRCDocURL = "https://docs.microsoft.com/windows/mixed-reality/mixed-reality-capture-for-developers#render-from-the-pv-camera-opt-in";
+        private const string DepthReprojectionDocURL = "https://docs.microsoft.com/windows/mixed-reality/hologram-stability#reprojection";
 
         protected override void OnEnable()
         {
@@ -36,7 +36,7 @@ public override void OnInspectorGUI()
         {
             RenderProfileHeader(ProfileTitle, ProfileDescription, target);
 
-            using (new GUIEnabledWrapper(!IsProfileLock((BaseMixedRealityProfile)target)))
+            using (new EditorGUI.DisabledGroupScope(IsProfileLock((BaseMixedRealityProfile)target)))
             {
                 serializedObject.Update();
 

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityDeviceManager.cs

@@ -379,13 +379,7 @@ public override void Enable()
             //NOTE: We update the source state data, in case an app wants to query it on source detected.
             for (var i = 0; i < numInteractionManagerStates; i++)
             {
-                var controller = GetController(interactionManagerStates[i].source);
-
-                if (controller != null)
-                {
-                    controller.UpdateController(interactionManagerStates[i]);
-                    Service?.RaiseSourceDetected(controller.InputSource, controller);
-                }
+                GetOrAddController(interactionManagerStates[i]);
             }
 
             if (InputSystemProfile.GesturesProfile != null &&
@@ -395,6 +389,26 @@ public override void Enable()
             }
         }
 
+        private void GetOrAddController(InteractionSourceState interactionSourceState)
+        {
+            // If this is a new detected controller, raise source detected event with input system
+            // check needs to be here because GetOrAddController adds it to the activeControllers Dictionary
+            // this could be cleaned up because that's not clear
+            bool raiseSourceDetected = !activeControllers.ContainsKey(interactionSourceState.source.id);
+
+            var controller = GetOrAddController(interactionSourceState.source);
+
+            if (controller != null)
+            {
+                if (raiseSourceDetected)
+                {
+                    Service?.RaiseSourceDetected(controller.InputSource, controller);
+                }
+
+                controller.UpdateController(interactionSourceState);
+            }
+        }
+
         /// <inheritdoc/>
         public override void Update()
         {
@@ -406,7 +420,7 @@ public override void Update()
             {
                 // SourceDetected gets raised when a new controller is detected and, if previously present, 
                 // when OnEnable is called. Do not create a new controller here.
-                var controller = GetController(interactionManagerStates[i].source, false);
+                var controller = GetOrAddController(interactionManagerStates[i].source, false);
 
                 if (controller != null)
                 {
@@ -553,7 +567,7 @@ public override void Disable()
         /// <param name="interactionSource">Source State provided by the SDK</param>
         /// <param name="addController">Should the Source be added as a controller if it isn't found?</param>
         /// <returns>New or Existing Controller Input Source</returns>
-        private BaseWindowsMixedRealitySource GetController(InteractionSource interactionSource, bool addController = true)
+        private BaseWindowsMixedRealitySource GetOrAddController(InteractionSource interactionSource, bool addController = true)
         {
             //If a device is already registered with the ID provided, just return it.
             if (activeControllers.ContainsKey(interactionSource.id))
@@ -672,7 +686,7 @@ private BaseWindowsMixedRealitySource GetController(InteractionSource interactio
         /// <param name="interactionSourceState">Source State provided by the SDK to remove</param>
         private void RemoveController(InteractionSource interactionSource)
         {
-            var controller = GetController(interactionSource, false);
+            var controller = GetOrAddController(interactionSource, false);
 
             if (controller != null)
             {
@@ -686,10 +700,12 @@ private void RemoveController(InteractionSource interactionSource)
                     }
                 }
 
-                if (controller.Visualizer != null &&
-                    controller.Visualizer.GameObjectProxy != null)
+                var visualizer = controller.Visualizer;
+
+                if (visualizer != null && !visualizer.Equals(null) &&
+                    visualizer.GameObjectProxy != null)
                 {
-                    controller.Visualizer.GameObjectProxy.SetActive(false);
+                    visualizer.GameObjectProxy.SetActive(false);
                 }
             }
 
@@ -704,19 +720,7 @@ private void RemoveController(InteractionSource interactionSource)
         /// SDK Interaction Source Detected Event handler
         /// </summary>
         /// <param name="args">SDK source detected event arguments</param>
-        private void InteractionManager_InteractionSourceDetected(InteractionSourceDetectedEventArgs args)
-        {
-            bool raiseSourceDetected = !activeControllers.ContainsKey(args.state.source.id);
-
-            var controller = GetController(args.state.source);
-
-            if (controller != null && raiseSourceDetected)
-            {
-                Service?.RaiseSourceDetected(controller.InputSource, controller);
-            }
-
-            controller?.UpdateController(args.state);
-        }
+        private void InteractionManager_InteractionSourceDetected(InteractionSourceDetectedEventArgs args) => GetOrAddController(args.state);
 
         /// <summary>
         /// SDK Interaction Source Pressed Event handler. Used only for voice.
@@ -726,7 +730,7 @@ private void InteractionManager_InteractionSourcePressed(InteractionSourcePresse
         {
             if (args.state.source.kind == InteractionSourceKind.Voice)
             {
-                var controller = GetController(args.state.source);
+                var controller = GetOrAddController(args.state.source);
                 if (controller != null)
                 {
                     controller.UpdateController(args.state);
@@ -747,7 +751,7 @@ private void InteractionManager_InteractionSourceReleased(InteractionSourceRelea
         {
             if (args.state.source.kind == InteractionSourceKind.Voice)
             {
-                GetController(args.state.source)?.UpdateController(args.state);
+                GetOrAddController(args.state.source)?.UpdateController(args.state);
             }
         }
 
@@ -766,7 +770,7 @@ private void InteractionManager_InteractionSourceLost(InteractionSourceLostEvent
 
         private void GestureRecognizer_HoldStarted(HoldStartedEventArgs args)
         {
-            var controller = GetController(args.source, false);
+            var controller = GetOrAddController(args.source, false);
             if (controller != null)
             {
                 Service?.RaiseGestureStarted(controller, holdAction);
@@ -775,7 +779,7 @@ private void GestureRecognizer_HoldStarted(HoldStartedEventArgs args)
 
         private void GestureRecognizer_HoldCompleted(HoldCompletedEventArgs args)
         {
-            var controller = GetController(args.source, false);
+            var controller = GetOrAddController(args.source, false);
             if (controller != null)
             {
                 Service?.RaiseGestureCompleted(controller, holdAction);
@@ -784,7 +788,7 @@ private void GestureRecognizer_HoldCompleted(HoldCompletedEventArgs args)
 
         private void GestureRecognizer_HoldCanceled(HoldCanceledEventArgs args)
         {
-            var controller = GetController(args.source, false);
+            var controller = GetOrAddController(args.source, false);
             if (controller != null)
             {
                 Service?.RaiseGestureCanceled(controller, holdAction);
@@ -793,7 +797,7 @@ private void GestureRecognizer_HoldCanceled(HoldCanceledEventArgs args)
 
         private void GestureRecognizer_ManipulationStarted(ManipulationStartedEventArgs args)
         {
-            var controller = GetController(args.source, false);
+            var controller = GetOrAddController(args.source, false);
             if (controller != null)
             {
                 Service?.RaiseGestureStarted(controller, manipulationAction);
@@ -802,7 +806,7 @@ private void GestureRecognizer_ManipulationStarted(ManipulationStartedEventArgs
 
         private void GestureRecognizer_ManipulationUpdated(ManipulationUpdatedEventArgs args)
         {
-            var controller = GetController(args.source, false);
+            var controller = GetOrAddController(args.source, false);
             if (controller != null)
             {
                 Service?.RaiseGestureUpdated(controller, manipulationAction, args.cumulativeDelta);
@@ -811,7 +815,7 @@ private void GestureRecognizer_ManipulationUpdated(ManipulationUpdatedEventArgs
 
         private void GestureRecognizer_ManipulationCompleted(ManipulationCompletedEventArgs args)
         {
-            var controller = GetController(args.source, false);
+            var controller = GetOrAddController(args.source, false);
             if (controller != null)
             {
                 Service?.RaiseGestureCompleted(controller, manipulationAction, args.cumulativeDelta);
@@ -820,7 +824,7 @@ private void GestureRecognizer_ManipulationCompleted(ManipulationCompletedEventA
 
         private void GestureRecognizer_ManipulationCanceled(ManipulationCanceledEventArgs args)
         {
-            var controller = GetController(args.source, false);
+            var controller = GetOrAddController(args.source, false);
             if (controller != null)
             {
                 Service?.RaiseGestureCanceled(controller, manipulationAction);
@@ -829,7 +833,7 @@ private void GestureRecognizer_ManipulationCanceled(ManipulationCanceledEventArg
 
         private void GestureRecognizer_Tapped(TappedEventArgs args)
         {
-            var controller = GetController(args.source, false);
+            var controller = GetOrAddController(args.source, false);
             if (controller != null)
             {
                 Service?.RaiseGestureCompleted(controller, selectAction);
@@ -842,7 +846,7 @@ private void GestureRecognizer_Tapped(TappedEventArgs args)
 
         private void NavigationGestureRecognizer_NavigationStarted(NavigationStartedEventArgs args)
         {
-            var controller = GetController(args.source, false);
+            var controller = GetOrAddController(args.source, false);
             if (controller != null)
             {
                 Service?.RaiseGestureStarted(controller, navigationAction);
@@ -851,7 +855,7 @@ private void NavigationGestureRecognizer_NavigationStarted(NavigationStartedEven
 
         private void NavigationGestureRecognizer_NavigationUpdated(NavigationUpdatedEventArgs args)
         {
-            var controller = GetController(args.source, false);
+            var controller = GetOrAddController(args.source, false);
             if (controller != null)
             {
                 Service?.RaiseGestureUpdated(controller, navigationAction, args.normalizedOffset);
@@ -860,7 +864,7 @@ private void NavigationGestureRecognizer_NavigationUpdated(NavigationUpdatedEven
 
         private void NavigationGestureRecognizer_NavigationCompleted(NavigationCompletedEventArgs args)
         {
-            var controller = GetController(args.source, false);
+            var controller = GetOrAddController(args.source, false);
             if (controller != null)
             {
                 Service?.RaiseGestureCompleted(controller, navigationAction, args.normalizedOffset);
@@ -869,7 +873,7 @@ private void NavigationGestureRecognizer_NavigationCompleted(NavigationCompleted
 
         private void NavigationGestureRecognizer_NavigationCanceled(NavigationCanceledEventArgs args)
         {
-            var controller = GetController(args.source, false);
+            var controller = GetOrAddController(args.source, false);
             if (controller != null)
             {
                 Service?.RaiseGestureCanceled(controller, navigationAction);

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityUtilities.cs

@@ -34,7 +34,7 @@ public static class WindowsMixedRealityUtilities
         /// On .NET Native, IInspectable pointers cannot be marshaled from native to managed code using Marshal.GetObjectForIUnknown.
         /// This class calls into a native method that specifically marshals the type as a specific WinRT interface, which
         /// is supported by the marshaller on both .NET Core and .NET Native.
-        /// Please see https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/InputSystem/HandTracking.html#net-native for more info.
+        /// Please see https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Input/HandTracking.html#net-native for more info.
         /// </remarks>
         private static SpatialCoordinateSystem GetSpatialCoordinateSystem(IntPtr nativePtr)
         {

Assets/MixedRealityToolkit.SDK/Experimental/Features/Dwell/DwellHandler.cs

@@ -8,7 +8,7 @@
 namespace Microsoft.MixedReality.Toolkit.Experimental.Dwell
 {
     /// <summary>
-    /// Use this component to add a Dwell modality (https://docs.microsoft.com/en-us/windows/mixed-reality/gaze-and-dwell) to the UI target.
+    /// Use this component to add a Dwell modality (https://docs.microsoft.com/windows/mixed-reality/gaze-and-dwell) to the UI target.
     /// </summary>
     [AddComponentMenu("Scripts/MRTK/SDK/DwellHandler")]
     public class DwellHandler : MonoBehaviour, IMixedRealityFocusHandler

Assets/MixedRealityToolkit.SDK/Experimental/ScrollingObjectCollection/README.md

@@ -10,7 +10,7 @@ Simply drop these prefabs into a scene, add the desired objects, and press "Upda
 ### Prerequisites
 
 - All objects in collection must use the MRTK standard shader
-- Every object in the collection must have a collider with a <see cref="NearInteractionTouchable"/>. All collision testing is currently done using these collidables, ScrollingObjectCollection does not yet support a static/nonmoving backing collider.
+- Every object in the collection must have a collider with a [`NearInteractionTouchable`](xref:Microsoft.MixedReality.Toolkit.Input.NearInteractionTouchable). All collision testing is currently done using these collidables, ScrollingObjectCollection does not yet support a static/nonmoving backing collider.
 - All objects in collection need to be the same size currently, additionally you may get unexpected results if your objects aren't centered in a gameObject.
 - For a seamless touchable surface, the 'cell size' in the scrolling collection should match the size of every object in the collection.
 

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Controllers/README.md

@@ -14,7 +14,7 @@ The framework is flexible enough to allow you to provide offsets to rotate and r
 
 Using the visualizer is extremely simple, just add it to an existing GameObject in your scene and provided you have configured your controller correctly, they will simply be instantiated into the scene at runtime when controllers are detected.
 
-![](../../../../../../Documentation/Images/ControllerVisualizer/ControllerVisualizerInspector.png)
+![Controller visualizer inspector](../../../../../../Documentation/Images/ControllerVisualizer/ControllerVisualizerInspector.png)
 
 Check the documentation on configuring Controller Profiles for more details: