nick/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-02-08 03:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #114487 from TokageItLab/fix-ad-start-animnode

Browse Source 
Fix discrete key is not processed by `advance_on_start` in AnimationNode
This commit is contained in:
Thaddeus Crews
2026-01-06 15:39:39 -06:00
parent 8072cc9779 c8c0aa9297
commit 82bc54c7d6
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scene/animation/animation_blend_tree.cpp
View File

@@ -156,9 +156,10 @@ AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(const AnimationMixe
// 1. Progress for AnimationNode.
bool will_end = Animation::is_greater_or_equal_approx(cur_time + cur_delta, cur_len);
bool is_started = p_seek && !p_is_external_seeking && Math::is_zero_approx(cur_time);
bool immediately_after_start = is_started && advance_on_start;
// 1. Progress for AnimationNode.
if (is_started && advance_on_start) {
if (immediately_after_start) {
cur_time = cur_delta;
}
if (cur_loop_mode != Animation::LOOP_NONE) {
@@ -265,6 +266,21 @@ AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(const AnimationMixe
}
if (!p_test_only) {
// Force process first key for Discrete/Method/Audio/AnimationPlayback.
if (immediately_after_start) {
AnimationMixer::PlaybackInfo pi = p_playback_info;
pi.start = 0.0;
pi.end = cur_len;
if (play_mode == PLAY_MODE_FORWARD) {
pi.time = 0;
} else {
pi.time = anim_size;
}
pi.delta = 0;
pi.weight = CMP_EPSILON;
blend_animation(animation, pi);
}
AnimationMixer::PlaybackInfo pi = p_playback_info;
pi.start = 0.0;
pi.end = cur_len;
@@ -281,9 +297,9 @@ AnimationNode::NodeTimeInfo AnimationNodeAnimation::_process(const AnimationMixe
pi.weight = 1.0;
pi.looped_flag = looped_flag;
blend_animation(animation, pi);
}
set_parameter(backward, cur_backward);
set_parameter(backward, cur_backward);
}
return nti;
}