Replace IsNear field in SliderEventData with more general Pointer field

- Pointer field can be used to determine if the right or left hand is hovering the slider
- Also, pointer can be used to determine if the interaction is near or far via pointer is IMixedRealityNearPointer

Author: Julia Schwarz

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Sliders/PinchSlider.cs

@@ -32,7 +32,7 @@ public float SliderValue
                 var oldSliderValue = sliderValue;
                 sliderValue = value;
                 UpdateUI();
-                OnValueUpdated.Invoke(new SliderEventData(oldSliderValue, value, activePointer is IMixedRealityPointer, this));
+                OnValueUpdated.Invoke(new SliderEventData(oldSliderValue, value, activePointer, this));
             }
         }
 
@@ -134,7 +134,7 @@ public void Start()
             sliderThumbOffset = thumbRoot.transform.position - thumbProjectedOnTrack;
 
             UpdateUI();
-            OnValueUpdated.Invoke(new SliderEventData(sliderValue, sliderValue, false, this));
+            OnValueUpdated.Invoke(new SliderEventData(sliderValue, sliderValue, null, this));
         }
 
         private void OnDisable()
@@ -172,7 +172,7 @@ private void EndInteraction()
         {
             if (OnInteractionEnded != null)
             {
-                OnInteractionEnded.Invoke(new SliderEventData(sliderValue, sliderValue, activePointer is IMixedRealityPointer, this));
+                OnInteractionEnded.Invoke(new SliderEventData(sliderValue, sliderValue, activePointer, this));
             }
             activePointer = null;
         }
@@ -182,12 +182,12 @@ private void EndInteraction()
         #region IMixedRealityFocusHandler
         public void OnFocusEnter(FocusEventData eventData)
         {
-            OnHoverEntered.Invoke(new SliderEventData(sliderValue, sliderValue, eventData.Pointer is IMixedRealityNearPointer, this));
+            OnHoverEntered.Invoke(new SliderEventData(sliderValue, sliderValue, eventData.Pointer, this));
         }
 
         public void OnFocusExit(FocusEventData eventData)
         {
-            OnHoverExited.Invoke(new SliderEventData(sliderValue, sliderValue, eventData.Pointer is IMixedRealityNearPointer, this));
+            OnHoverExited.Invoke(new SliderEventData(sliderValue, sliderValue, eventData.Pointer, this));
         }
         #endregion
 
@@ -214,7 +214,7 @@ public void OnPointerDown(MixedRealityPointerEventData eventData)
                 startSliderPosition = gameObject.transform.position;
                 if (OnInteractionStarted != null)
                 {
-                    OnInteractionStarted.Invoke(new SliderEventData(sliderValue, sliderValue, activePointer is IMixedRealityPointer, this));
+                    OnInteractionStarted.Invoke(new SliderEventData(sliderValue, sliderValue, activePointer, this));
                 }
 
                 // Mark the pointer data as used to prevent other behaviors from handling input events

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Sliders/SliderEventData.cs

@@ -2,15 +2,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 //
+using Microsoft.MixedReality.Toolkit.Input;
+
 namespace Microsoft.MixedReality.Toolkit.UI
 {
     public class SliderEventData
     {
-        public SliderEventData(float o, float n, bool isNear, PinchSlider slider)
+        public SliderEventData(float o, float n, IMixedRealityPointer pointer, PinchSlider slider)
         {
             OldValue = o;
             NewValue = n;
-            IsNear = isNear;
+            Pointer = pointer;
             Slider = slider;
         }
 
@@ -30,8 +32,9 @@ public SliderEventData(float o, float n, bool isNear, PinchSlider slider)
         public PinchSlider Slider { get; private set; }
 
         /// <summary>
-        /// Whether the slider is being interacted near or at a distance.
+        /// The currently active pointer manipulating / hovering the slider,
+        /// or null if no pointer is manipulating the slider
         /// </summary>
-        public bool IsNear { get; set; }
+        public IMixedRealityPointer Pointer { get; set; }
     }
 }