Move extracting linear operations into special class.

This commit is contained in:
Gandifil
2024-01-22 19:03:17 +03:00
parent fd760e3e4f
commit 3f44766bd4
3 changed files with 30 additions and 23 deletions
@@ -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; }
}
+5 -5
View File
@@ -4,9 +4,9 @@ using Microsoft.Xna.Framework;
namespace MonoGame.Extended.Tweening
{
public class Tween<T> : Tween
where T : struct
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;
@@ -23,12 +23,12 @@ namespace MonoGame.Extended.Tweening
protected override void Initialize()
{
_startValue = Member.Value;
_range = TweenMember<T>.Subtract(_endValue, _startValue);
_range = LinearOperations<T>.Subtract(_endValue, _startValue);
}
protected override void Interpolate(float n)
{
var value = TweenMember<T>.Add(_startValue, TweenMember<T>.Multiply(_range, n));
var value = LinearOperations<T>.Add(_startValue, LinearOperations<T>.Multiply(_range, n));
Member.Value = value;
}
@@ -189,4 +189,4 @@ namespace MonoGame.Extended.Tweening
}
}
}
}
@@ -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); }
}
}
}
}