diff options
| author | Aaron Franke <arnfranke@yahoo.com> | 2020-03-16 05:07:33 -0400 |
|---|---|---|
| committer | Aaron Franke <arnfranke@yahoo.com> | 2020-04-29 04:02:49 -0400 |
| commit | 540156b387270215f513a68b1cf9ffc909ac381b (patch) | |
| tree | e5c7f89c9c70294dd1a5aac5461fbb9170868578 /scene/animation/animation_player.cpp | |
| parent | ad3c3e1bbbdbf47fca6d775e01867820040d84f1 (diff) | |
| download | redot-engine-540156b387270215f513a68b1cf9ffc909ac381b.tar.gz | |
[Core] Rename linear_interpolate 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; |