Merge pull request #3490 from keveleigh/wmr-device-manager-cleanup

Change WMR.RemoveController to take in an InteractionSource

Author: David Kline

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityDeviceManager.cs

@@ -379,7 +379,7 @@ public override void Disable()
             InteractionSourceState[] states = InteractionManager.GetCurrentReading();
             for (var i = 0; i < states.Length; i++)
             {
-                RemoveController(states[i]);
+                RemoveController(states[i].source);
             }
         }
 
@@ -444,16 +444,16 @@ private WindowsMixedRealityController GetController(InteractionSource interactio
         /// Remove the selected controller from the Active Store
         /// </summary>
         /// <param name="interactionSourceState">Source State provided by the SDK to remove</param>
-        private void RemoveController(InteractionSourceState interactionSourceState)
+        private void RemoveController(InteractionSource interactionSource)
         {
-            var controller = GetController(interactionSourceState.source, false);
+            var controller = GetController(interactionSource, false);
 
             if (controller != null)
             {
                 MixedRealityToolkit.InputSystem?.RaiseSourceLost(controller.InputSource, controller);
             }
 
-            activeControllers.Remove(interactionSourceState.source.id);
+            activeControllers.Remove(interactionSource.id);
         }
 
         #endregion Controller Utilities
@@ -484,7 +484,7 @@ private void InteractionManager_InteractionSourceDetected(InteractionSourceDetec
         /// <param name="args">SDK source updated event arguments</param>
         private void InteractionManager_InteractionSourceLost(InteractionSourceLostEventArgs args)
         {
-            RemoveController(args.state);
+            RemoveController(args.state.source);
         }
 
         #endregion Unity InteractionManager Events