Merge pull request #3963 from djohnsomsft/inputsimulation_activecontrollers

Add GetActiveControllers implementation to InputSimulationService

Author: David Kline

Assets/MixedRealityToolkit.Services/InputSimulation/Editor/InputSimulationService.cs

@@ -4,6 +4,7 @@
 using Microsoft.MixedReality.Toolkit.Utilities;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 
 namespace Microsoft.MixedReality.Toolkit.Input
@@ -32,6 +33,11 @@ public class InputSimulationService : BaseInputDeviceManager, IInputSimulationSe
         /// </summary>
         private readonly Dictionary<Handedness, SimulatedHand> trackedHands = new Dictionary<Handedness, SimulatedHand>();
 
+        /// <summary>
+        /// Active controllers
+        /// </summary>
+        private IMixedRealityController[] activeControllers = new IMixedRealityController[0];
+
         /// <summary>
         /// Timestamp of the last hand device update
         /// </summary>
@@ -50,6 +56,12 @@ public InputSimulationService(
         {
         }
 
+        /// <inheritdoc />
+        public override IMixedRealityController[] GetActiveControllers()
+        {
+            return activeControllers;
+        }
+
         /// <inheritdoc />
         public override void Initialize()
         {
@@ -276,6 +288,7 @@ private SimulatedHand GetOrAddHandDevice(Handedness handedness, HandSimulationMo
             MixedRealityToolkit.InputSystem?.RaiseSourceDetected(controller.InputSource, controller);
 
             trackedHands.Add(handedness, controller);
+            UpdateActiveControllers();
 
             return controller;
         }
@@ -288,6 +301,7 @@ private void RemoveHandDevice(Handedness handedness)
                 MixedRealityToolkit.InputSystem?.RaiseSourceLost(controller.InputSource, controller);
 
                 trackedHands.Remove(handedness);
+                UpdateActiveControllers();
             }
         }
 
@@ -298,6 +312,12 @@ private void RemoveAllHandDevices()
                 MixedRealityToolkit.InputSystem?.RaiseSourceLost(controller.InputSource, controller);
             }
             trackedHands.Clear();
+            UpdateActiveControllers();
+        }
+
+        private void UpdateActiveControllers()
+        {
+            activeControllers = trackedHands.Values.ToArray<IMixedRealityController>();
         }
     }
 }