diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-04-29 15:50:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 15:50:00 +0200 |
| commit | 58435b0c917fd93d4244ed672e7fadd076dae608 (patch) | |
| tree | b41bc67f056615084a111fdad09e25033e2d21a0 /scene/animation/animation_player.cpp | |
| parent | 1d45a269f87ff38e04169e6aa85d9ecd73fb3473 (diff) | |
| parent | 540156b387270215f513a68b1cf9ffc909ac381b (diff) | |
Merge pull request #20371 from aaronfranke/vector-lerp
[Core] [Mono] [GDNative] Rename "linear_interpolate" methods to "lerp"
Diffstat (limited to 'scene/animation/animation_player.cpp')
| -rw-r--r-- | scene/animation/animation_player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 946f759610..9ef6b9864a 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -395,9 +395,9 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float } else { - nc->loc_accum = nc->loc_accum.linear_interpolate(loc, p_interp); + nc->loc_accum = nc->loc_accum.lerp(loc, p_interp); nc->rot_accum = nc->rot_accum.slerp(rot, p_interp); - nc->scale_accum = nc->scale_accum.linear_interpolate(scale, p_interp); + nc->scale_accum = nc->scale_accum.lerp(scale, p_interp); } } break; |