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

Merge pull request #6462 from RandomShaper/fix-improve-anim-blend

Browse Source 
Fix/improve AnimationPlayer blending logic
This commit is contained in:
Rémi Verschelde 2017-02-27 14:39:54 +01:00 committed by GitHub
commit df365fdc3c
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scene/animation/animation_player.cpp
View File

@ -588,35 +588,26 @@ void AnimationPlayer::_animation_process2(float p_delta) {
Playback &c=playback;
float prev_blend=1.0;
accum_pass++;
int pop_count=1;
int pop=0; // if >0, then amount of elements to pop from the back
_animation_process_data(c.current,p_delta,1.0f);
for (List<Blend>::Element *E=c.blend.back();E;E=E->prev(),pop_count++) {
List<Blend>::Element *prev = NULL;
for (List<Blend>::Element *E=c.blend.back();E;E=prev) {
Blend& b=E->get();
_animation_process_data(b.data,p_delta,prev_blend);
prev_blend=1.0-b.blend_left/b.blend_time;
float blend=b.blend_left/b.blend_time;
_animation_process_data(b.data,p_delta,blend);
b.blend_left-=Math::absf(speed_scale*p_delta);
prev = E->prev();
if (b.blend_left<0) {
pop=pop_count;
c.blend.erase(E);
}
}
while(pop--) {
c.blend.pop_back();
}
_animation_process_data(c.current,p_delta,prev_blend);
}