Fix bug in the Select method for animatables - did not handle non-animated case. (#416)

Also rationalized the select methods a bit to make them simpler.

Author: Simeon

source/Animatables/Animatable.cs

@@ -102,19 +102,18 @@ public Animatable(T initialValue, IReadOnlyList<KeyFrame<T>> keyFrames)
         public bool IsEverNot(T value) => !IsAlways(value);
 
         public Animatable<T> WithTimeOffset(double timeOffset)
-            => timeOffset == 0
-                ? this
-                : new Animatable<T>(KeyFrames.Select(kf => kf.WithTimeOffset(timeOffset)));
+            => timeOffset != 0 || IsAnimated
+                ? new Animatable<T>(KeyFrames.Select(kf => kf.WithTimeOffset(timeOffset)))
+                : this;
 
         IAnimatableValue<T> IAnimatableValue<T>.WithTimeOffset(double timeOffset)
             => WithTimeOffset(timeOffset);
 
-        public Animatable<T> Select(Func<T, T> selector)
-            => new Animatable<T>(KeyFrames.Select(kf => new KeyFrame<T>(kf.Frame, selector(kf.Value), kf.Easing)));
-
         public Animatable<Tnew> Select<Tnew>(Func<T, Tnew> selector)
             where Tnew : IEquatable<Tnew>
-            => new Animatable<Tnew>(KeyFrames.Select(kf => new KeyFrame<Tnew>(kf.Frame, selector(kf.Value), kf.Easing)));
+            => IsAnimated
+                    ? new Animatable<Tnew>(KeyFrames.Select(kf => kf.CloneWithNewValue(selector(kf.Value))))
+                    : new Animatable<Tnew>(selector(InitialValue));
 
         /// <inheritdoc/>
         // Not a great hash code because it ignore the KeyFrames, but quick.

source/Animatables/AnimatableVector2.cs

@@ -30,20 +30,20 @@ public AnimatableVector2 WithOffset(Vector2 offset)
             => Select(vector2 => vector2 + offset);
 
         public new AnimatableVector2 WithTimeOffset(double timeOffset)
-            => timeOffset == 0
-                ? this
-                : new AnimatableVector2(KeyFrames.Select(kf => kf.WithTimeOffset(timeOffset)));
+            => timeOffset != 0 || IsAnimated
+                ? new AnimatableVector2(KeyFrames.Select(kf => kf.WithTimeOffset(timeOffset)))
+                : this;
 
         IAnimatableVector2 IAnimatableVector2.WithOffset(Vector2 offset)
             => WithOffset(offset);
 
         IAnimatableVector2 IAnimatableVector2.WithTimeOffset(double timeOffset)
             => WithTimeOffset(timeOffset);
 
-        public new AnimatableVector2 Select(Func<Vector2, Vector2> selector)
+        public AnimatableVector2 Select(Func<Vector2, Vector2> selector)
             => IsAnimated
-                ? new AnimatableVector2(KeyFrames.Select(kf => new KeyFrame<Vector2>(kf.Frame, selector(kf.Value), kf.Easing)))
-                : new AnimatableVector2(selector(InitialValue));
+                    ? new AnimatableVector2(KeyFrames.Select(kf => kf.CloneWithNewValue(selector(kf.Value))))
+                    : new AnimatableVector2(selector(InitialValue));
 
         /// <inheritdoc/>
         public AnimatableVector2Type Type => AnimatableVector2Type.Vector2;

source/Animatables/AnimatableVector3.cs

@@ -30,15 +30,17 @@ public AnimatableVector3 WithOffset(Vector2 offset)
             => Select(vector3 => vector3 + new Vector3(offset.X, offset.Y, 0));
 
         public new AnimatableVector3 WithTimeOffset(double timeOffset)
-            => timeOffset == 0
-                ? this
-                : new AnimatableVector3(KeyFrames.Select(kf => kf.WithTimeOffset(timeOffset)));
+            => timeOffset != 0 || IsAnimated
+                ? new AnimatableVector3(KeyFrames.Select(kf => kf.WithTimeOffset(timeOffset)))
+                : this;
 
         IAnimatableVector3 IAnimatableVector3.WithTimeOffset(double timeOffset)
             => WithTimeOffset(timeOffset);
 
-        public new AnimatableVector3 Select(Func<Vector3, Vector3> selector)
-            => new AnimatableVector3(KeyFrames.Select(kf => new KeyFrame<Vector3>(kf.Frame, selector(kf.Value), kf.Easing)));
+        public AnimatableVector3 Select(Func<Vector3, Vector3> selector)
+            => IsAnimated
+                    ? new AnimatableVector3(KeyFrames.Select(kf => kf.CloneWithNewValue(selector(kf.Value))))
+                    : new AnimatableVector3(selector(InitialValue));
 
         /// <inheritdoc/>
         public AnimatableVector3Type Type => AnimatableVector3Type.Vector3;