Skip to content

Fix incorrect animation section when playing a custom timeline with stretched time scale. #118114

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
chocola-mint wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −2
Open

Fix incorrect animation section when playing a custom timeline with stretched time scale. #118114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions scene/animation/animation_blend_tree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,21 @@ AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(ProcessState &p_pro
double anim_size = anim->get_length();

double cur_len;
double playback_end;
Animation::LoopMode cur_loop_mode;
if (use_custom_timeline) {
cur_len = timeline_length;
if (stretch_time_scale) {
// When time scale is stretched, the entire animation is played anyway using a time scale based on the timeline length.
// Therefore, the end of the animation section is the animation length.
playback_end = anim_size;
} else {
playback_end = timeline_length;
}
cur_loop_mode = loop_mode;
} else {
cur_len = anim_size;
playback_end = anim_size;
cur_loop_mode = anim->get_loop_mode();
}

Expand Down Expand Up @@ -244,7 +253,7 @@ AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(ProcessState &p_pro
if (immediately_after_start) {
AnimationMixer::PlaybackInfo pi = p_playback_info;
pi.start = 0.0;
pi.end = cur_len;
pi.end = playback_end;
if (play_mode == PLAY_MODE_FORWARD) {
pi.time = 0;
} else {
Expand All @@ -257,7 +266,7 @@ AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(ProcessState &p_pro

AnimationMixer::PlaybackInfo pi = p_playback_info;
pi.start = 0.0;
pi.end = cur_len;
pi.end = playback_end;
if (play_mode == PLAY_MODE_FORWARD) {
pi.time = cur_playback_time;
} else {
Expand Down
Loading