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 /modules/gdscript/gdscript_functions.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 'modules/gdscript/gdscript_functions.cpp')
-rw-r--r-- | modules/gdscript/gdscript_functions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp index 9154d6eb89..58161d6f53 100644 --- a/modules/gdscript/gdscript_functions.cpp +++ b/modules/gdscript/gdscript_functions.cpp @@ -362,13 +362,13 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_ const double t = (double)*p_args[2]; switch (p_args[0]->get_type() == p_args[1]->get_type() ? p_args[0]->get_type() : Variant::FLOAT) { case Variant::VECTOR2: { - r_ret = ((Vector2)*p_args[0]).linear_interpolate((Vector2)*p_args[1], t); + r_ret = ((Vector2)*p_args[0]).lerp((Vector2)*p_args[1], t); } break; case Variant::VECTOR3: { - r_ret = (p_args[0]->operator Vector3()).linear_interpolate(p_args[1]->operator Vector3(), t); + r_ret = (p_args[0]->operator Vector3()).lerp(p_args[1]->operator Vector3(), t); } break; case Variant::COLOR: { - r_ret = ((Color)*p_args[0]).linear_interpolate((Color)*p_args[1], t); + r_ret = ((Color)*p_args[0]).lerp((Color)*p_args[1], t); } break; default: { VALIDATE_ARG_NUM(0); |