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 /core/math/transform.cpp | |
| parent | ad3c3e1bbbdbf47fca6d775e01867820040d84f1 (diff) | |
| download | redot-engine-540156b387270215f513a68b1cf9ffc909ac381b.tar.gz | |
[Core] Rename linear_interpolate to lerp
Diffstat (limited to 'core/math/transform.cpp')
| -rw-r--r-- | core/math/transform.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/math/transform.cpp b/core/math/transform.cpp index 9dad3262d2..82e4005d3e 100644 --- a/core/math/transform.cpp +++ b/core/math/transform.cpp @@ -129,8 +129,8 @@ Transform Transform::interpolate_with(const Transform &p_transform, real_t p_c) Vector3 dst_loc = p_transform.origin; Transform interp; - interp.basis.set_quat_scale(src_rot.slerp(dst_rot, p_c).normalized(), src_scale.linear_interpolate(dst_scale, p_c)); - interp.origin = src_loc.linear_interpolate(dst_loc, p_c); + interp.basis.set_quat_scale(src_rot.slerp(dst_rot, p_c).normalized(), src_scale.lerp(dst_scale, p_c)); + interp.origin = src_loc.lerp(dst_loc, p_c); return interp; } |