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

Fix animation blending bug where an animation with a short blend time played immediately after an animation with a long blend time would play with a long blend time or cause popping/incorrect animation positions.

Browse Source
This commit is contained in:
jitspoe 2019-11-12 22:16:13 -05:00 committed by jitspoe
parent dcb3754db0
commit 7a7f5a2216
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
scene/animation/animation_player.cpp
View File

@ -1072,26 +1072,35 @@ void AnimationPlayer::_animation_process2(double p_delta, bool p_started) {
accum_pass++; accum_pass++;
bool seeked = c.seeked; // The animation may be changed during process, so it is safer that the state is changed before process. bool seeked = c.seeked; // The animation may be changed during process, so it is safer that the state is changed before process.
if (p_delta != 0) { if (p_delta != 0) {
c.seeked = false; c.seeked = false;
} }
_animation_process_data(c.current, p_delta, 1.0f, seeked, p_started); float blend = 1.0; // First animation we play at 100% blend
List<Blend>::Element *prev = nullptr; List<Blend>::Element *next = NULL;
for (List<Blend>::Element *E = c.blend.back(); E; E = prev) { for (List<Blend>::Element *E = c.blend.front(); E; E = next) {
Blend &b = E->get(); Blend &b = E->get();
float blend = b.blend_left / b.blend_time; // Note: There may be issues if an animation event triggers an animation change while this blend is active,
b.blend_left -= Math::absf(speed_scale * p_delta); // so it is best to use "deferred" calls instead of "immediate" for animation events that can trigger new animations.
prev = E->prev();
if (b.blend_left < 0) {
c.blend.erase(E);
}
// The effect of animation changes during blending is unknown...
// In that case, we recommends to use method call mode "deferred", not "immediate".
_animation_process_data(b.data, p_delta, blend, false, false); _animation_process_data(b.data, p_delta, blend, false, false);
blend = 1.0 - b.blend_left / b.blend_time; // This is how much to blend the NEXT animation
b.blend_left -= Math::absf(speed_scale * p_delta);
next = E->next();
if (b.blend_left < 0) {
// If the blend of this has finished, we need to remove ALL the previous blends
List<Blend>::Element *prev;
while (E) {
prev = E->prev();
c.blend.erase(E);
E = prev;
} }
} }
}
_animation_process_data(c.current, p_delta, blend, seeked, p_started);
}
void AnimationPlayer::_animation_update_transforms() { void AnimationPlayer::_animation_update_transforms() {
{ {
@ -1643,6 +1652,8 @@ void AnimationPlayer::play(const StringName &p_name, double p_custom_blend, floa
b.data = c.current; b.data = c.current;
b.blend_time = b.blend_left = blend_time; b.blend_time = b.blend_left = blend_time;
c.blend.push_back(b); c.blend.push_back(b);
} else {
c.blend.clear();
} }
} }