Simplify logic

Author: keveleigh

Assets/MRTK/Core/Providers/BaseEyeGazeDataProvider.cs

@@ -8,6 +8,9 @@
 
 namespace Microsoft.MixedReality.Toolkit.Input
 {
+    /// <summary>
+    /// Provides some predefined parameters for eye gaze smoothing and saccade detection.
+    /// </summary>
     public abstract class BaseEyeGazeDataProvider : BaseInputDeviceManager, IMixedRealityEyeGazeDataProvider, IMixedRealityEyeSaccadeProvider
     {
         /// <summary>
@@ -106,7 +109,7 @@ protected Ray SmoothGaze(Ray? newGaze)
                 // apart, we check for clusters of gaze points instead.
                 // 1. If the user's gaze points are far enough apart, this may be a saccade, but also could be an outlier.
                 //    So, let's mark it as a potential saccade.
-                if ((IsSaccading(oldGaze.Value, newGaze.Value) && (confidenceOfSaccade == 0)))
+                if (IsSaccading(oldGaze.Value, newGaze.Value) && confidenceOfSaccade == 0)
                 {
                     confidenceOfSaccade++;
                     saccade_initialGazePoint = oldGaze.Value;
@@ -115,7 +118,7 @@ protected Ray SmoothGaze(Ray? newGaze)
                 }
                 // 2. If we have a potential saccade marked, let's check if the new points are within the proximity of 
                 //    the initial saccade point.
-                else if ((confidenceOfSaccade > 0) && (confidenceOfSaccade < confidenceOfSaccadeThreshold))
+                else if (confidenceOfSaccade > 0 && confidenceOfSaccade < confidenceOfSaccadeThreshold)
                 {
                     confidenceOfSaccade++;
 

Assets/MRTK/Providers/WindowsMixedReality/XR2018/WindowsMixedRealityEyeGazeDataProvider.cs

@@ -82,7 +82,7 @@ public WindowsMixedRealityEyeGazeDataProvider(
         #region IMixedRealityCapabilityCheck Implementation
 
         /// <inheritdoc />
-        public bool CheckCapability(MixedRealityCapability capability) => eyesApiAvailable ? capability == MixedRealityCapability.EyeTracking : false;
+        public bool CheckCapability(MixedRealityCapability capability) => eyesApiAvailable && capability == MixedRealityCapability.EyeTracking;
 
         #endregion IMixedRealityCapabilityCheck Implementation
 

Assets/MRTK/Providers/WindowsMixedReality/XRSDK/WindowsMixedRealityEyeGazeDataProvider.cs

@@ -78,21 +78,18 @@ public override void Update()
 
                 Service?.EyeGazeProvider?.UpdateEyeTrackingStatus(this, true);
 
-                if (centerEye.TryGetFeatureValue(WindowsMRUsages.EyeGazeTracked, out bool gazeTracked) && gazeTracked)
+                if (centerEye.TryGetFeatureValue(WindowsMRUsages.EyeGazeTracked, out bool gazeTracked) && gazeTracked
+                    && centerEye.TryGetFeatureValue(WindowsMRUsages.EyeGazePosition, out Vector3 eyeGazePosition)
+                    && centerEye.TryGetFeatureValue(WindowsMRUsages.EyeGazeRotation, out Quaternion eyeGazeRotation))
                 {
-                    Vector3 eyeGazePosition;
-                    Quaternion eyeGazeRotation;
-                    if (centerEye.TryGetFeatureValue(WindowsMRUsages.EyeGazePosition, out eyeGazePosition) && centerEye.TryGetFeatureValue(WindowsMRUsages.EyeGazeRotation, out eyeGazeRotation))
-                    {
-                        Ray newGaze = new Ray(eyeGazePosition, eyeGazeRotation * Vector3.forward);
-
-                        if (SmoothEyeTracking)
-                        {
-                            newGaze = SmoothGaze(newGaze);
-                        }
+                    Ray newGaze = new Ray(eyeGazePosition, eyeGazeRotation * Vector3.forward);
 
-                        Service?.EyeGazeProvider?.UpdateEyeGaze(this, newGaze, DateTime.UtcNow);
+                    if (SmoothEyeTracking)
+                    {
+                        newGaze = SmoothGaze(newGaze);
                     }
+
+                    Service?.EyeGazeProvider?.UpdateEyeGaze(this, newGaze, DateTime.UtcNow);
                 }
             }
         }