input system now gives instance of itself to gaze provider

Author: David Kline (ANALOG)

Assets/MixedRealityToolkit.Services/InputSystem/FocusProvider.cs

@@ -942,7 +942,7 @@ public void OnSourceLost(SourceStateEventData eventData)
                 if (gazeProviderPointingData != null && eventData.InputSource.Pointers[i].PointerId == gazeProviderPointingData.Pointer.PointerId)
                 {
                     // If the source lost is the gaze input source, then reset it.
-                    if (eventData.InputSource.SourceId == MixedRealityToolkit.InputSystem.GazeProvider.GazeInputSource.SourceId)
+                    if (eventData.InputSource.SourceId == ((IMixedRealityInputSystem)Service).GazeProvider.GazeInputSource.SourceId)
                     {
                         gazeProviderPointingData.ResetFocusedObjects();
                         gazeProviderPointingData = null;

Assets/MixedRealityToolkit.Services/InputSystem/GazeProvider.cs

@@ -83,6 +83,9 @@ public bool Enabled
             set { enabled = value; }
         }
 
+        /// <inheritdoc />
+        public IMixedRealityInputSystem InputSystem { private get; set; }
+
         /// <inheritdoc />
         public IMixedRealityInputSource GazeInputSource
         {
@@ -249,7 +252,7 @@ public override bool TryGetPointerRotation(out Quaternion rotation)
             /// <param name="inputSource"></param>
             public void RaisePointerDown(MixedRealityInputAction mixedRealityInputAction, Handedness handedness = Handedness.None, IMixedRealityInputSource inputSource = null)
             {
-                MixedRealityToolkit.InputSystem.RaisePointerDown(this, mixedRealityInputAction, handedness, inputSource);
+                gazeProvider.InputSystem?.RaisePointerDown(this, mixedRealityInputAction, handedness, inputSource);
             }
 
             /// <summary>
@@ -260,8 +263,8 @@ public void RaisePointerDown(MixedRealityInputAction mixedRealityInputAction, Ha
             /// <param name="inputSource"></param>
             public void RaisePointerUp(MixedRealityInputAction mixedRealityInputAction, Handedness handedness = Handedness.None, IMixedRealityInputSource inputSource = null)
             {
-                MixedRealityToolkit.InputSystem.RaisePointerClicked(this, mixedRealityInputAction, 0, handedness, inputSource);
-                MixedRealityToolkit.InputSystem.RaisePointerUp(this, mixedRealityInputAction, handedness, inputSource);
+                gazeProvider.InputSystem?.RaisePointerClicked(this, mixedRealityInputAction, 0, handedness, inputSource);
+                gazeProvider.InputSystem?.RaisePointerUp(this, mixedRealityInputAction, handedness, inputSource);
             }
         }
 
@@ -355,7 +358,7 @@ protected override void OnDisable()
         {
             base.OnDisable();
             GazePointer.BaseCursor?.SetVisibility(false);
-            MixedRealityToolkit.InputSystem?.RaiseSourceLost(GazeInputSource);
+            InputSystem?.RaiseSourceLost(GazeInputSource);
         }
 
         #endregion MonoBehaviour Implementation
@@ -407,12 +410,11 @@ private IMixedRealityPointer InitializeGazePointer()
 
             gazePointer = new InternalGazePointer(this, "Gaze Pointer", null, raycastLayerMasks, maxGazeCollisionDistance, gazeTransform, stabilizer);
 
-            if (GazeCursor == null &&
-                MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile != null &&
-                MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile != null &&
-                MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile.GazeCursorPrefab != null)
+            if ((GazeCursor == null) &&
+                (GazeCursorPrefab != null))
             {
-                var cursor = Instantiate(GazeCursorPrefab, MixedRealityToolkit.Instance.MixedRealityPlayspace);
+                // todo: update....
+                GameObject cursor = Instantiate(GazeCursorPrefab, MixedRealityToolkit.Instance.MixedRealityPlayspace);
                 SetGazeCursor(cursor);
             }
 
@@ -422,7 +424,7 @@ private IMixedRealityPointer InitializeGazePointer()
         private async void RaiseSourceDetected()
         {
             await WaitUntilInputSystemValid;
-            MixedRealityToolkit.InputSystem.RaiseSourceDetected(GazeInputSource);
+            InputSystem?.RaiseSourceDetected(GazeInputSource);
             GazePointer.BaseCursor?.SetVisibility(true);
         }
 

Assets/MixedRealityToolkit.Services/InputSystem/MixedRealityInputSystem.cs

@@ -154,6 +154,7 @@ public override void Initialize()
                 if (profile.PointerProfile.GazeProviderType?.Type != null)
                 {
                     GazeProvider = CameraCache.Main.gameObject.EnsureComponent(profile.PointerProfile.GazeProviderType.Type) as IMixedRealityGazeProvider;
+                    GazeProvider.InputSystem = this;
                     GazeProvider.GazeCursorPrefab = profile.PointerProfile.GazeCursorPrefab;
                 }
                 else

Assets/MixedRealityToolkit/Interfaces/InputSystem/IMixedRealityGazeProvider.cs

@@ -15,6 +15,11 @@ public interface IMixedRealityGazeProvider
         /// </summary>
         bool Enabled { get; set; }
 
+        /// <summary>
+        /// The <see cref="IMixedRealtyInputSystem"/> instance for which this object is providing gaze data.
+        /// </summary>
+        IMixedRealityInputSystem InputSystem { set; }
+
         /// <summary>
         /// The Gaze Input Source for the provider.
         /// </summary>
@@ -26,7 +31,7 @@ public interface IMixedRealityGazeProvider
         IMixedRealityPointer GazePointer { get; }
 
         /// <summary>
-        /// 
+        /// The prefab to be instantiated as the gaze cursor.
         /// </summary>
         GameObject GazeCursorPrefab { get; set; }