Update ControllerFinder with new Visualizer pattern

Author: keveleigh

Assets/MixedRealityToolkit-SDK/Features/Utilities/Solvers/ControllerFinder.cs

@@ -3,11 +3,9 @@
 
 using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
 using Microsoft.MixedReality.Toolkit.Core.EventDatum.Input;
-using Microsoft.MixedReality.Toolkit.Core.Interfaces;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem.Handlers;
 using Microsoft.MixedReality.Toolkit.Core.Managers;
-using System.Collections.Generic;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.SDK.Utilities.Solvers
@@ -43,19 +41,10 @@ public Handedness Handedness
         /// </summary>
         protected Transform ControllerTransform;
 
-        private IEnumerable<IMixedRealityManager> BaseDeviceManagers => baseDeviceManagers ?? (baseDeviceManagers = MixedRealityManager.Instance.GetManagers(typeof(IMixedRealityDeviceManager)));
-        private IEnumerable<IMixedRealityManager> baseDeviceManagers = null;
-
         #region MonoBehaviour Implementation
 
         protected virtual void OnEnable()
         {
-            if (BaseDeviceManagers == null)
-            {
-                // The base device manager has not been set up yet.
-                return;
-            }
-
             // Look if the controller has loaded.
             RefreshControllerTransform();
         }
@@ -89,24 +78,18 @@ protected virtual void TryAndAddControllerTransform()
         {
             // Look if the controller was already loaded. This could happen if the
             // GameObject was instantiated at runtime and the model loaded event has already fired.
-            if (BaseDeviceManagers == null)
+            if (MixedRealityManager.InputSystem == null)
             {
-                // The BaseDeviceManager could not be found.
+                // The InputSystem could not be found.
                 return;
             }
 
-            foreach (IMixedRealityDeviceManager manager in BaseDeviceManagers)
+            foreach (IMixedRealityController controller in MixedRealityManager.InputSystem.DetectedControllers)
             {
-                IMixedRealityController[] controllers = manager.GetActiveControllers();
-
-                for (int i = 0; i < controllers.Length; i++)
+                if (controller.ControllerHandedness == handedness)
                 {
-                    if (controllers[i].ControllerHandedness == handedness)
-                    {
-                        AddControllerTransform(controllers[i]);
-                        return;
-                    }
- 
+                    AddControllerTransform(controller);
+                    return;
                 }
             }
         }
@@ -117,9 +100,9 @@ protected virtual void TryAndAddControllerTransform()
         /// <param name="newController">The new controller to be tracked.</param>
         protected virtual void AddControllerTransform(IMixedRealityController newController)
         {
-            if (newController.ControllerHandedness == handedness && newController.Transform != null && !newController.Transform.Equals(ControllerTransform))
+            if (newController.ControllerHandedness == handedness && newController.Visualizer.GameObjectProxy.transform != null && !newController.Visualizer.GameObjectProxy.transform.Equals(ControllerTransform))
             {
-                ControllerTransform = newController.Transform;
+                ControllerTransform = newController.Visualizer.GameObjectProxy.transform;
 
                 OnControllerFound();
             }

Assets/MixedRealityToolkit/_Core/Devices/BaseController.cs

@@ -81,9 +81,6 @@ protected BaseController(TrackingState trackingState, Handedness controllerHande
         /// <inheritdoc />
         public MixedRealityInteractionMapping[] Interactions { get; private set; } = null;
 
-        /// <inheritdoc />
-        public Transform Transform { get; protected set; }
-
         #endregion IMixedRealityController Implementation
 
         /// <summary>
@@ -204,8 +201,6 @@ private void TryRenderControllerModel(Type controllerType)
                 {
                     Debug.LogError($"{controllerObject.name} is missing a IMixedRealityControllerVisualizer component!");
                 }
-
-                Transform = controllerObject.transform;
             }
         }
     }

Assets/MixedRealityToolkit/_Core/Interfaces/Devices/IMixedRealityController.cs

@@ -4,7 +4,6 @@
 using Microsoft.MixedReality.Toolkit.Core.Definitions.Devices;
 using Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
-using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices
 {
@@ -65,10 +64,5 @@ public interface IMixedRealityController
         /// Mapping definition for this controller, linking the Physical inputs to logical Input System Actions
         /// </summary>
         MixedRealityInteractionMapping[] Interactions { get; }
-
-        /// <summary>
-        /// The transform of this controller, used for tracking and observing the controller if it's tracked.
-        /// </summary>
-        Transform Transform { get; }
     }
 }