added controller data provider reference to the controller (#62)

XRTK · Apr 7, 2020 · 3ca952d · 3ca952d
1 parent cb45086
commit 3ca952d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/Controllers/WindowsMixedRealityController.cs b/Controllers/WindowsMixedRealityController.cs
@@ -5,6 +5,7 @@
 using XRTK.Definitions.InputSystem;
 using XRTK.Definitions.Utilities;
 using XRTK.Interfaces.InputSystem;
+using XRTK.Interfaces.Providers.Controllers;
 using XRTK.Providers.Controllers;
 
 #if UNITY_WSA
@@ -21,15 +22,9 @@ namespace XRTK.WindowsMixedReality.Controllers
     /// </summary>
     public class WindowsMixedRealityController : BaseController
     {
-        /// <summary>
-        /// Constructor.
-        /// </summary>
-        /// <param name="trackingState"></param>
-        /// <param name="controllerHandedness"></param>
-        /// <param name="inputSource"></param>
-        /// <param name="interactions"></param>
-        public WindowsMixedRealityController(TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
-                : base(trackingState, controllerHandedness, inputSource, interactions)
+        /// <inheritdoc />
+        public WindowsMixedRealityController(IMixedRealityControllerDataProvider controllerDataProvider, TrackingState trackingState, Handedness controllerHandedness, IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
+                : base(controllerDataProvider, trackingState, controllerHandedness, inputSource, interactions)
         {
         }
 

diff --git a/Controllers/WindowsMixedRealityControllerDataProvider.cs b/Controllers/WindowsMixedRealityControllerDataProvider.cs
@@ -420,7 +420,7 @@ private WindowsMixedRealityController GetController(InteractionSource interactio
             var pointers = interactionSource.supportsPointing ? RequestPointers(typeof(WindowsMixedRealityController), controllingHand) : null;
             var nameModifier = controllingHand == Handedness.None ? interactionSource.kind.ToString() : controllingHand.ToString();
             var inputSource = MixedRealityToolkit.InputSystem?.RequestNewGenericInputSource($"Mixed Reality Controller {nameModifier}", pointers);
-            var detectedController = new WindowsMixedRealityController(TrackingState.NotApplicable, controllingHand, inputSource);
+            var detectedController = new WindowsMixedRealityController(this, TrackingState.NotApplicable, controllingHand, inputSource);
 
             if (!detectedController.SetupConfiguration(typeof(WindowsMixedRealityController)))
             {
@@ -505,11 +505,11 @@ private void RemoveController(InteractionSourceState interactionSourceState, boo
             if (controller != null)
             {
                 MixedRealityToolkit.InputSystem?.RaiseSourceLost(controller.InputSource, controller);
-                RemoveController(controller);
             }
 
             if (clearFromRegistry)
             {
+                RemoveController(controller);
                 activeControllers.Remove(interactionSourceState.source.id);
             }
         }