Skip to content

Fix start of animations being inconsistent by tweaking AnimationTrackProperty.cs. #6610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mika10095 wants to merge 3 commits into
base: master
Choose a base branch
from
+5 −2
Open

Fix start of animations being inconsistent by tweaking AnimationTrackProperty.cs. #6610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aefe5d6
fix first frame of animations being wonky
mika10095 Jun 2, 2026
d970314
update tests
mika10095 Jun 2, 2026
52fd52c
fix tests
mika10095 Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Robust.Client.IntegrationTests/UserInterface/ControlTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ public void TestAnimations()
Property = nameof(TestControl.Foo),
KeyFrames =
{
new AnimationTrackProperty.KeyFrame(0f, 0f), // This is the common way to specify the first keyframe.
new AnimationTrackProperty.KeyFrame(1f, 1f),
new AnimationTrackProperty.KeyFrame(3f, 2f)
}
Expand All @@ -168,7 +169,7 @@ public void TestAnimations()
control.PlayAnimation(animation, "foo");
control.DoFrameUpdateRecursive(new FrameEventArgs(0.5f));

Assert.That(control.Foo, new ApproxEqualityConstraint(0f)); // Should still be 0.
Assert.That(control.Foo, new ApproxEqualityConstraint(0.5f)); // Should be 0.5 as half a second elapsed and our 1s keyframe is at 1.

control.DoFrameUpdateRecursive(new FrameEventArgs(0.5001f));

Expand Down
4 changes: 3 additions & 1 deletion Robust.Client/Animations/AnimationTrackProperty.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ public override (int KeyFrameIndex, float FramePlayingTime) AdvancePlayback(obje
var nextKeyFrame = keyFrameIndex + 1;
if (nextKeyFrame == 0)
{
// Still before the first keyframe, do nothing.
// At the start snap the anim to the first keyframe
value = KeyFrames[0].Value;
ApplyProperty(context, value);
return (keyFrameIndex, playingTime);
}

Expand Down
Loading