Syntriax/Syntriax.Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Amend Me

Browse Source
This commit is contained in:
Syntriax
2025-05-30 16:05:49 +03:00
committed by Syntriax
parent 846aa75dd5
commit b5140a94de
57 changed files with 437 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Engine.Systems/Tween/ITween.cs
View File

@@ -1,16 +1,18 @@
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Systems.Tween;
public interface ITween
{
event TweenEventHandler? OnStarted;
event TweenEventHandler? OnPaused;
event TweenEventHandler? OnResumed;
event TweenEventHandler? OnCancelled;
event TweenEventHandler? OnCompleted;
event TweenEventHandler? OnEnded;
Event<ITween> OnStarted { get; }
Event<ITween> OnPaused { get; }
Event<ITween> OnResumed { get; }
Event<ITween> OnCancelled { get; }
Event<ITween> OnCompleted { get; }
Event<ITween> OnEnded { get; }
event TweenEventHandler? OnUpdated;
event TweenDeltaEventHandler? OnDeltaUpdated;
Event<ITween> OnUpdated { get; }
Event<ITween, TweenDeltaArguments> OnDeltaUpdated { get; }
TweenState State { get; set; }
@@ -19,7 +21,6 @@ public interface ITween
float Progress { get; }
float Value { get; }
delegate void TweenEventHandler(ITween sender);
delegate void TweenDeltaEventHandler(ITween sender, float delta);
readonly record struct TweenDeltaArguments(float Delta);
}

18
Engine.Systems/Tween/Tween.cs
View File

@@ -4,14 +4,14 @@ namespace Syntriax.Engine.Systems.Tween;
internal class Tween : ITween
{
public event ITween.TweenEventHandler? OnStarted = null;
public event ITween.TweenEventHandler? OnPaused = null;
public event ITween.TweenEventHandler? OnResumed = null;
public event ITween.TweenEventHandler? OnCancelled = null;
public event ITween.TweenEventHandler? OnCompleted = null;
public event ITween.TweenEventHandler? OnEnded = null;
public event ITween.TweenEventHandler? OnUpdated = null;
public event ITween.TweenDeltaEventHandler? OnDeltaUpdated = null;
public Event<ITween> OnStarted { get; init; } = new();
public Event<ITween> OnPaused { get; init; } = new();
public Event<ITween> OnResumed { get; init; } = new();
public Event<ITween> OnCancelled { get; init; } = new();
public Event<ITween> OnCompleted { get; init; } = new();
public Event<ITween> OnEnded { get; init; } = new();
public Event<ITween> OnUpdated { get; init; } = new();
public Event<ITween, ITween.TweenDeltaArguments> OnDeltaUpdated { get; init; } = new();
private TweenState _state = TweenState.Idle;
public TweenState State
@@ -60,7 +60,7 @@ internal class Tween : ITween
Progress = Counter / Duration;
OnUpdated?.Invoke(this);
OnDeltaUpdated?.Invoke(this, Easing.Evaluate(Progress) - Easing.Evaluate(previousProgress));
OnDeltaUpdated?.Invoke(this, new(Easing.Evaluate(Progress) - Easing.Evaluate(previousProgress)));
if (_counter >= Duration)
State = TweenState.Completed;

26
Engine.Systems/Tween/TweenExtensions.cs
View File

@@ -1,7 +1,5 @@
using System;
using Syntriax.Engine.Core;
namespace Syntriax.Engine.Systems.Tween;
public static class TweenExtensions
@@ -11,14 +9,14 @@ public static class TweenExtensions
Tween tweenConcrete = (Tween)tween;
int counter = count;
tweenConcrete.OnCompleted += _ =>
tweenConcrete.OnCompleted.AddListener(_ =>
{
if (counter-- <= 0)
return;
tweenConcrete.Reset();
tweenConcrete.State = TweenState.Playing;
};
});
return tween;
}
@@ -26,11 +24,11 @@ public static class TweenExtensions
public static ITween LoopInfinitely(this ITween tween)
{
Tween tweenConcrete = (Tween)tween;
tweenConcrete.OnCompleted += _ =>
tweenConcrete.OnCompleted.AddListener(_ =>
{
tweenConcrete.Reset();
tweenConcrete.State = TweenState.Playing;
};
});
return tween;
}
@@ -46,56 +44,56 @@ public static class TweenExtensions
public static ITween OnStart(this ITween tween, Action callback)
{
Tween tweenConcrete = (Tween)tween;
tweenConcrete.OnStarted += _ => callback.Invoke();
tweenConcrete.OnStarted.AddListener(_ => callback.Invoke());
return tween;
}
public static ITween OnPause(this ITween tween, Action callback)
{
Tween tweenConcrete = (Tween)tween;
tweenConcrete.OnPaused += _ => callback.Invoke();
tweenConcrete.OnPaused.AddListener(_ => callback.Invoke());
return tween;
}
public static ITween OnResume(this ITween tween, Action callback)
{
Tween tweenConcrete = (Tween)tween;
tweenConcrete.OnResumed += _ => callback.Invoke();
tweenConcrete.OnResumed.AddListener(_ => callback.Invoke());
return tween;
}
public static ITween OnCancel(this ITween tween, Action callback)
{
Tween tweenConcrete = (Tween)tween;
tweenConcrete.OnCancelled += _ => callback.Invoke();
tweenConcrete.OnCancelled.AddListener(_ => callback.Invoke());
return tween;
}
public static ITween OnComplete(this ITween tween, Action callback)
{
Tween tweenConcrete = (Tween)tween;
tweenConcrete.OnCompleted += _ => callback.Invoke();
tweenConcrete.OnCompleted.AddListener(_ => callback.Invoke());
return tween;
}
public static ITween OnEnd(this ITween tween, Action callback)
{
Tween tweenConcrete = (Tween)tween;
tweenConcrete.OnEnded += _ => callback.Invoke();
tweenConcrete.OnEnded.AddListener(_ => callback.Invoke());
return tween;
}
public static ITween OnUpdate(this ITween tween, Action callback)
{
Tween tweenConcrete = (Tween)tween;
tweenConcrete.OnUpdated += _ => callback.Invoke();
tweenConcrete.OnUpdated.AddListener(_ => callback.Invoke());
return tween;
}
public static ITween OnDeltaUpdate(this ITween tween, Action<float> callback)
{
Tween tweenConcrete = (Tween)tween;
tweenConcrete.OnDeltaUpdated += (_, delta) => callback.Invoke(delta);
tweenConcrete.OnDeltaUpdated.AddListener((_, arguments) => callback.Invoke(arguments.Delta));
return tween;
}
}

2
Engine.Systems/Tween/TweenManager.cs
View File

@@ -14,7 +14,7 @@ public class TweenManager : UniverseObject, ITweenManager
public ITween StartTween(float duration, ITweenManager.TweenSetCallback? setCallback = null)
{
Tween tween = new(duration);
tween.OnUpdated += tween => setCallback?.Invoke(tween.Value);
tween.OnUpdated.AddListener(tween => setCallback?.Invoke(tween.Value));
runningCoroutines.Add(tween, coroutineManager.StartCoroutine(RunTween(tween)));
return tween;
}