diff --git a/src/cs/MonoGame.Extended.Tweening/LinearOperations.cs b/src/cs/MonoGame.Extended.Tweening/LinearOperations.cs new file mode 100644 index 00000000..12a03a8e --- /dev/null +++ b/src/cs/MonoGame.Extended.Tweening/LinearOperations.cs @@ -0,0 +1,21 @@ +using System; +using System.Linq.Expressions; + +namespace MonoGame.Extended.Tweening; + +public class LinearOperations +{ + static LinearOperations() + { + var a = Expression.Parameter(typeof(T)); + var b = Expression.Parameter(typeof(T)); + var c = Expression.Parameter(typeof(float)); + Add = Expression.Lambda>(Expression.Add(a, b), a, b).Compile(); + Subtract = Expression.Lambda>(Expression.Subtract(a, b), a, b).Compile(); + Multiply = Expression.Lambda>(Expression.Multiply(a, c), a, c).Compile(); + } + + public static Func Add { get; } + public static Func Subtract { get; } + public static Func Multiply { get; } +} diff --git a/src/cs/MonoGame.Extended.Tweening/Tween.cs b/src/cs/MonoGame.Extended.Tweening/Tween.cs index b15a30ee..115b66da 100644 --- a/src/cs/MonoGame.Extended.Tweening/Tween.cs +++ b/src/cs/MonoGame.Extended.Tweening/Tween.cs @@ -4,9 +4,9 @@ using Microsoft.Xna.Framework; namespace MonoGame.Extended.Tweening { public class Tween : Tween - where T : struct + where T : struct { - internal Tween(object target, float duration, float delay, TweenMember member, T endValue) + internal Tween(object target, float duration, float delay, TweenMember member, T endValue) : base(target, duration, delay) { Member = member; @@ -23,12 +23,12 @@ namespace MonoGame.Extended.Tweening protected override void Initialize() { _startValue = Member.Value; - _range = TweenMember.Subtract(_endValue, _startValue); + _range = LinearOperations.Subtract(_endValue, _startValue); } protected override void Interpolate(float n) { - var value = TweenMember.Add(_startValue, TweenMember.Multiply(_range, n)); + var value = LinearOperations.Add(_startValue, LinearOperations.Multiply(_range, n)); Member.Value = value; } @@ -189,4 +189,4 @@ namespace MonoGame.Extended.Tweening } } -} \ No newline at end of file +} diff --git a/src/cs/MonoGame.Extended.Tweening/TweenMember.cs b/src/cs/MonoGame.Extended.Tweening/TweenMember.cs index 59414e17..adcee598 100644 --- a/src/cs/MonoGame.Extended.Tweening/TweenMember.cs +++ b/src/cs/MonoGame.Extended.Tweening/TweenMember.cs @@ -16,29 +16,15 @@ namespace MonoGame.Extended.Tweening } public abstract class TweenMember : 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>(Expression.Add(a, b), a, b).Compile(); - Subtract = Expression.Lambda>(Expression.Subtract(a, b), a, b).Compile(); - Multiply = Expression.Lambda>(Expression.Multiply(a, c), a, c).Compile(); - } - - public static Func Add { get; } - public static Func Subtract { get; } - public static Func Multiply { get; } - protected TweenMember(object target, Func getMethod, Action setMethod) : base(target) { _getMethod = getMethod; - _setMethod = setMethod; + _setMethod = setMethod; } - + private readonly Func _getMethod; private readonly Action _setMethod; @@ -48,4 +34,4 @@ namespace MonoGame.Extended.Tweening set { _setMethod(Target, value); } } } -} \ No newline at end of file +}