Skip to content

Carry time delta between tweens in a Sequence #39

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

Merged
merged 2 commits into from
Aug 3, 2022
Merged

Carry time delta between tweens in a Sequence #39

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d0d6e2
Carry time delta between tweens in a Sequence
Gyrobifastigium Aug 3, 2022
f243ad7
Add test for Sequence tick across tween boundaries
benfrankel Aug 3, 2022
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
28 changes: 13 additions & 15 deletions src/tweenable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,28 +660,26 @@ impl<T> Tweenable<T> for Sequence<T> {

fn tick(
&mut self,
delta: Duration,
mut delta: Duration,
target: &mut T,
entity: Entity,
event_writer: &mut EventWriter<TweenCompleted>,
) -> TweenState {
if self.index < self.tweens.len() {
let mut state = TweenState::Active;
self.time = (self.time + delta).min(self.duration);
self.time = (self.time + delta).min(self.duration);
while self.index < self.tweens.len() {
let tween = &mut self.tweens[self.index];
let tween_state = tween.tick(delta, target, entity, event_writer);
if tween_state == TweenState::Completed {
tween.rewind();
self.index += 1;
if self.index >= self.tweens.len() {
state = TweenState::Completed;
self.times_completed = 1;
}
let tween_remaining = tween.duration().mul_f32(1.0 - tween.progress());
if let TweenState::Active = tween.tick(delta, target, entity, event_writer) {
return TweenState::Active;
}
state
} else {
TweenState::Completed

tween.rewind();
delta -= tween_remaining;
self.index += 1;
}

self.times_completed = 1;
TweenState::Completed
}

fn times_completed(&self) -> u32 {
Expand Down