diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-01 12:05:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-01 12:05:18 +0200 |
| commit | 3c4fab295b96c9bd852601531bf35c1ade56b54c (patch) | |
| tree | 9adcec083a49ca4935ff70e1257bd492ca88df62 /core/math/expression.cpp | |
| parent | 64a88e8ef35d692f31d6114793468623c6756785 (diff) | |
| parent | c00427add34f505cff275ea33423f1053423d646 (diff) | |
Merge pull request #27789 from Giacom/move_towards
Added move_toward functions for float, Vector2 and Vector3
Diffstat (limited to 'core/math/expression.cpp')
| -rw-r--r-- | core/math/expression.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/math/expression.cpp b/core/math/expression.cpp index 079c9b524f..e484e9194d 100644 --- a/core/math/expression.cpp +++ b/core/math/expression.cpp @@ -70,6 +70,7 @@ const char *Expression::func_name[Expression::FUNC_MAX] = { "inverse_lerp", "range_lerp", "smoothstep", + "move_toward", "dectime", "randomize", "randi", @@ -189,6 +190,7 @@ int Expression::get_func_argument_count(BuiltinFunc p_func) { case MATH_LERP: case MATH_INVERSE_LERP: case MATH_SMOOTHSTEP: + case MATH_MOVE_TOWARD: case MATH_DECTIME: case MATH_WRAP: case MATH_WRAPF: @@ -407,6 +409,13 @@ void Expression::exec_func(BuiltinFunc p_func, const Variant **p_inputs, Variant VALIDATE_ARG_NUM(2); *r_return = Math::smoothstep((double)*p_inputs[0], (double)*p_inputs[1], (double)*p_inputs[2]); } break; + case MATH_MOVE_TOWARD: { + + VALIDATE_ARG_NUM(0); + VALIDATE_ARG_NUM(1); + VALIDATE_ARG_NUM(2); + *r_return = Math::move_toward((double)*p_inputs[0], (double)*p_inputs[1], (double)*p_inputs[2]); + } break; case MATH_DECTIME: { VALIDATE_ARG_NUM(0); |