Merge pull request #835 from craftworkgames/tweener_enchancing

Tweener enchanting

src/cs/MonoGame.Extended.Tweening/ColorTween.cs

@@ -0,0 +1,15 @@
+using Microsoft.Xna.Framework;
+
+namespace MonoGame.Extended.Tweening;
+
+public class ColorTween: Tween<Color>
+{
+    internal ColorTween(object target, float duration, float delay, TweenMember<Color> member, Color endValue) : base(target, duration, delay, member, endValue)
+    {
+    }
+
+    protected override void Interpolate(float n)
+    {
+        Member.Value = Color.Lerp(_startValue, _endValue, n);
+    }
+}

src/cs/MonoGame.Extended.Tweening/LinearOperations.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Linq.Expressions;
+
+namespace MonoGame.Extended.Tweening;
+
+public class LinearOperations<T>
+{
+    static LinearOperations()
+    {
+        var a = Expression.Parameter(typeof(T));
+        var b = Expression.Parameter(typeof(T));
+        var c = Expression.Parameter(typeof(float));
+        Add = Expression.Lambda<Func<T, T, T>>(Expression.Add(a, b), a, b).Compile();
+        Subtract = Expression.Lambda<Func<T, T, T>>(Expression.Subtract(a, b), a, b).Compile();
+        Multiply = Expression.Lambda<Func<T, float, T>>(Expression.Multiply(a, c), a, c).Compile();
+    }
+
+    public static Func<T, T, T> Add { get; }
+    public static Func<T, T, T> Subtract { get; }
+    public static Func<T, float, T> Multiply { get; }
+}

src/cs/MonoGame.Extended.Tweening/LinearTween.cs

@@ -0,0 +1,23 @@
+namespace MonoGame.Extended.Tweening;
+
+public class LinearTween<T>: Tween<T>
+    where T: struct
+{
+    private T _range;
+
+    internal LinearTween(object target, float duration, float delay, TweenMember<T> member, T endValue) : base(target, duration, delay, member, endValue)
+    {
+    }
+
+    protected override void Initialize()
+    {
+        base.Initialize();
+        _range = LinearOperations<T>.Subtract(_endValue, _startValue);
+    }
+
+    protected override void Interpolate(float n)
+    {
+        var value = LinearOperations<T>.Add(_startValue, LinearOperations<T>.Multiply(_range, n));
+        Member.Value = value;
+    }
+}

src/cs/MonoGame.Extended.Tweening/Tween.cs

@@ -3,10 +3,10 @@ using Microsoft.Xna.Framework;
 
 namespace MonoGame.Extended.Tweening
 {
-    public class Tween<T> : Tween
-        where T : struct 
+    public abstract class Tween<T> : Tween
+        where T : struct
     {
-        internal Tween(object target, float duration, float delay, TweenMember<T> member, T endValue) 
+        internal Tween(object target, float duration, float delay, TweenMember<T> member, T endValue)
             : base(target, duration, delay)
         {
             Member = member;
@@ -16,20 +16,12 @@ namespace MonoGame.Extended.Tweening
         public TweenMember<T> Member { get; }
         public override string MemberName => Member.Name;
 
-        private T _startValue;
-        private T _endValue;
-        private T _range;
+        protected T _startValue;
+        protected T _endValue;
 
         protected override void Initialize()
         {
             _startValue = Member.Value;
-            _range = TweenMember<T>.Subtract(_endValue, _startValue);
-        }
-
-        protected override void Interpolate(float n)
-        {
-            var value = TweenMember<T>.Add(_startValue, TweenMember<T>.Multiply(_range, n));
-            Member.Value = value;
         }
 
         protected override void Swap()
@@ -189,4 +181,4 @@ namespace MonoGame.Extended.Tweening
         }
 
     }
-}
+}

src/cs/MonoGame.Extended.Tweening/TweenMember.cs

@@ -16,29 +16,15 @@ namespace MonoGame.Extended.Tweening
     }
 
     public abstract class TweenMember<T> : TweenMember
-        where T : struct 
+        where T : struct
     {
-        static TweenMember()
-        {
-            var a = Expression.Parameter(typeof(T));
-            var b = Expression.Parameter(typeof(T));
-            var c = Expression.Parameter(typeof(float));
-            Add = Expression.Lambda<Func<T, T, T>>(Expression.Add(a, b), a, b).Compile();
-            Subtract = Expression.Lambda<Func<T, T, T>>(Expression.Subtract(a, b), a, b).Compile();
-            Multiply = Expression.Lambda<Func<T, float, T>>(Expression.Multiply(a, c), a, c).Compile();
-        }
-
-        public static Func<T, T, T> Add { get; }
-        public static Func<T, T, T> Subtract { get; }
-        public static Func<T, float, T> Multiply { get; }
-
         protected TweenMember(object target, Func<object, object> getMethod, Action<object, object> setMethod)
             : base(target)
         {
             _getMethod = getMethod;
-            _setMethod = setMethod; 
+            _setMethod = setMethod;
         }
-        
+
         private readonly Func<object, object> _getMethod;
         private readonly Action<object, object> _setMethod;
 
@@ -48,4 +34,4 @@ namespace MonoGame.Extended.Tweening
             set { _setMethod(Target, value); }
         }
     }
-}
+}

src/cs/MonoGame.Extended.Tweening/Tweener.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using Microsoft.Xna.Framework;
 
 namespace MonoGame.Extended.Tweening
 {
@@ -26,6 +27,21 @@ namespace MonoGame.Extended.Tweening
         public Tween<TMember> TweenTo<TTarget, TMember>(TTarget target, Expression<Func<TTarget, TMember>> expression, TMember toValue, float duration, float delay = 0f)
             where TTarget : class
             where TMember : struct
+        {
+            switch (toValue)
+            {
+                case Color toValueColor:
+                    return (Tween<TMember>)(object)TweenTo<TTarget, Color, ColorTween>(target, expression as Expression<Func<TTarget, Color>>, toValueColor, duration, delay);
+                default:
+                    return TweenTo<TTarget, TMember, LinearTween<TMember>>(target, expression, toValue, duration, delay);
+            }
+
+        }
+
+        public Tween<TMember> TweenTo<TTarget, TMember, TTween>(TTarget target, Expression<Func<TTarget, TMember>> expression, TMember toValue, float duration, float delay = 0f)
+            where TTarget : class
+            where TMember : struct
+            where TTween : Tween<TMember>
         {
             var memberExpression = (MemberExpression)expression.Body;
             var memberInfo = memberExpression.Member;
@@ -35,7 +51,7 @@ namespace MonoGame.Extended.Tweening
             activeTween?.Cancel();
 
             AllocationCount++;
-            var tween = new Tween<TMember>(target, duration, delay, member, toValue);
+            var tween = (TTween)Activator.CreateInstance(typeof(TTween), target, duration, delay, member, toValue);
             _activeTweens.Add(tween);
             return tween;
         }
@@ -112,4 +128,4 @@ namespace MonoGame.Extended.Tweening
             throw new InvalidOperationException($"'{memberName}' is not a property or field of the target");
         }
     }
-}
+}