godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91822 from TokageItLab/inv-offset 

Invert start offset on AnimationNode custom timeline
This commit is contained in:
Rémi Verschelde 2024-05-11 16:19:31 +02:00
parent 916ea002c1 d654acbd39
commit 10471a4c06
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/animation/animation_blend_tree.cpp
View File

@ -194,8 +194,8 @@ AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(const AnimationMixe
nti.is_just_looped = is_just_looped; nti.is_just_looped = is_just_looped;
// 3. Progress for Animation. // 3. Progress for Animation.
double prev_playback_time = prev_time - start_offset; double prev_playback_time = prev_time + start_offset;
double cur_playback_time = cur_time - start_offset; double cur_playback_time = cur_time + start_offset;
if (stretch_time_scale) { if (stretch_time_scale) {
double mlt = anim_size / cur_len; double mlt = anim_size / cur_len;
cur_playback_time *= mlt; cur_playback_time *= mlt;
@ -241,7 +241,7 @@ AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(const AnimationMixe
process_state->tree->call_deferred(SNAME("emit_signal"), "animation_started", animation); process_state->tree->call_deferred(SNAME("emit_signal"), "animation_started", animation);
} }
// Finished. // Finished.
if (prev_time - start_offset < anim_size && cur_playback_time >= anim_size) { if (prev_time + start_offset < anim_size && cur_playback_time >= anim_size) {
process_state->tree->call_deferred(SNAME("emit_signal"), "animation_finished", animation); process_state->tree->call_deferred(SNAME("emit_signal"), "animation_finished", animation);
} }
} }