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 /core/math/transform.cpp | |
| parent | 1d45a269f87ff38e04169e6aa85d9ecd73fb3473 (diff) | |
| parent | 540156b387270215f513a68b1cf9ffc909ac381b (diff) | |
| download | redot-engine-58435b0c917fd93d4244ed672e7fadd076dae608.tar.gz | |
Merge pull request #20371 from aaronfranke/vector-lerp
[Core] [Mono] [GDNative] Rename "linear_interpolate" methods 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; } |