From 739309c28f116f3f9ce56a70a884dd330c879393 Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Mon, 10 Dec 2018 15:58:53 +0800
Subject: [PATCH] Replace binary-search on keyframe selection with naive
 approach for now.

---
 .../Animators/Animator`1.cs                   | 36 ++++---------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/src/Avalonia.Animation/Animators/Animator`1.cs b/src/Avalonia.Animation/Animators/Animator`1.cs
index e79aa128d6..e42489d6a6 100644
--- a/src/Avalonia.Animation/Animators/Animator`1.cs
+++ b/src/Avalonia.Animation/Animators/Animator`1.cs
@@ -78,7 +78,7 @@ namespace Avalonia.Animation.Animators
             double t0 = firstKeyframe.Cue.CueValue;
             double t1 = lastKeyframe.Cue.CueValue;
 
-            double progress = (animationTime - t0) / (t1 - t0); 
+            double progress = (animationTime - t0) / (t1 - t0);
 
             T oldValue, newValue;
 
@@ -97,30 +97,11 @@ namespace Avalonia.Animation.Animators
 
         private int FindClosestBeforeKeyFrame(double time)
         {
-            int FindClosestBeforeKeyFrame(int startIndex, int length)
-            {
-                if (length == 0 || length == 1)
-                {
-                    return startIndex;
-                }
-
-                int middle = startIndex + (length / 2);
+            for (int i = 0; i < _convertedKeyframes.Count; i++)
+                if (_convertedKeyframes[i].Cue.CueValue > time)
+                    return i - 1;
 
-                if (_convertedKeyframes[middle].Cue.CueValue < time)
-                {
-                    return FindClosestBeforeKeyFrame(middle, length - middle);
-                }
-                else if (_convertedKeyframes[middle].Cue.CueValue > time)
-                {
-                    return FindClosestBeforeKeyFrame(startIndex, middle - startIndex);
-                }
-                else
-                {
-                    return middle;
-                }
-            }
-
-            return FindClosestBeforeKeyFrame(0, _convertedKeyframes.Count);
+            throw new Exception("Index time is out of keyframe time range.");
         }
 
         /// <summary>
@@ -139,13 +120,10 @@ namespace Avalonia.Animation.Animators
         }
 
         /// <summary>
-        /// Interpolates a value given the desired time.
+        /// Interpolates in-between two key values given the desired progress time.
         /// </summary>
         public abstract T Interpolate(double progress, T oldValue, T newValue);
 
-        /// <summary>
-        /// Verifies, converts and sorts keyframe values according to this class's target type.
-        /// </summary>
         private void VerifyConvertKeyFrames()
         {
             foreach (AnimatorKeyFrame keyframe in this)
@@ -193,4 +171,4 @@ namespace Avalonia.Animation.Animators
             }
         }
     }
-}
\ No newline at end of file
+}