animation event now can be triggered even if skipped

isadorasophia · Jul 22, 2023 · 71f09f2 · 71f09f2
1 parent 85e76b8
commit 71f09f2
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/src/Murder.Editor/Systems/SpriteRenderDebugSystem.cs b/src/Murder.Editor/Systems/SpriteRenderDebugSystem.cs
@@ -166,7 +166,10 @@ public void Draw(RenderContext render, Context context)
 
  if (!frameInfo.Event.IsEmpty)
  {
- e.SendMessage(new AnimationEventMessage(frameInfo.Event.ToString()));
+ foreach (var ev in frameInfo.Event)
+ {
+ e.SendMessage(new AnimationEventMessage(ev));
+ }
  }
 
  if (frameInfo.Complete && overload != null)

diff --git a/src/Murder/Core/Graphics/Animation.cs b/src/Murder/Core/Graphics/Animation.cs
@@ -125,7 +125,15 @@ public FrameInfo Evaluate(float time, float lastFrameTime, bool animationLoop, f
  int clampedFrame = Math.Clamp(frame, 0, Frames.Length - 1);
  if (previousFrame != frame)
  {
- return new FrameInfo(Frames[clampedFrame], time + Game.FixedDeltaTime * 2 >= animationDuration, Events.ContainsKey(clampedFrame) ? Events[clampedFrame] : ReadOnlySpan<char>.Empty);
+ var events = ImmutableArray.CreateBuilder<string>();
+ for (int i = previousFrame; i <= frame; i++)
+ {
+ if (Events.ContainsKey(i))
+ {
+ events.Add(Events[i]);
+ }
+ }
+ return new FrameInfo(Frames[clampedFrame], time + Game.FixedDeltaTime * 2 >= animationDuration, events.ToImmutable());
  }
  else
  {

diff --git a/src/Murder/Core/Graphics/FrameInfo.cs b/src/Murder/Core/Graphics/FrameInfo.cs
@@ -9,7 +9,7 @@ namespace Murder.Core;
 /// <summary>
 /// A struct representing information about a single animation frame, such as its index in the list and a flag indicating whether the animation is complete
 /// </summary>
-public ref struct FrameInfo
+public readonly struct FrameInfo
 {
  internal static FrameInfo Fail => new() { Failed = true };
 
@@ -28,9 +28,16 @@ public ref struct FrameInfo
  /// <summary>
  /// A string ID representing the events played since the last played frame (if any). Usually set in Aseprite.
  /// </summary>
- public readonly ReadOnlySpan<char> Event;
+ public readonly ImmutableArray<string> Event = ImmutableArray<string>.Empty;
 
  public FrameInfo(int frame, bool animationComplete, ReadOnlySpan<char> @event)
+ {
+ Frame = frame;
+ Complete = animationComplete;
+ Event = ImmutableArray.Create(@event.ToString());
+ }
+
+ public FrameInfo(int frame, bool animationComplete, ImmutableArray<string> @event)
  {
  Frame = frame;
  Complete = animationComplete;

diff --git a/src/Murder/Systems/Agents/AgentSpriteSystem.cs b/src/Murder/Systems/Agents/AgentSpriteSystem.cs
@@ -200,7 +200,10 @@ public void Draw(RenderContext render, Context context)
 
  if (!frameInfo.Event.IsEmpty)
  {
- e.SendMessage(new AnimationEventMessage(frameInfo.Event.ToString()));
+ foreach (var ev in frameInfo.Event)
+ {
+ e.SendMessage(new AnimationEventMessage(ev));
+ }
  }
 
  // The animation overload is now done

diff --git a/src/Murder/Systems/Graphics/SpriteRenderSystem.cs b/src/Murder/Systems/Graphics/SpriteRenderSystem.cs
@@ -179,7 +179,10 @@ public void Draw(RenderContext render, Context context)
 
  if (!frameInfo.Event.IsEmpty)
  {
- e.SendMessage(new AnimationEventMessage(frameInfo.Event.ToString()));
+ foreach (var ev in frameInfo.Event)
+ {
+ e.SendMessage(new AnimationEventMessage(ev));
+ }
  }
 
  if (frameInfo.Complete)