diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-20 13:37:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 13:37:13 +0200 |
| commit | 60efd67034724f3563d46e9ff3fd2db34763535b (patch) | |
| tree | d5dc6ee7c3c64f18cd94db98895c4a09bd7c5aa1 /core/math/expression.cpp | |
| parent | 9d6b6dbd2fd61ede0030804332f9def112cf25e4 (diff) | |
| parent | 6694c119d069d8ff8dc5290d38d2d33625f07807 (diff) | |
| download | redot-engine-60efd67034724f3563d46e9ff3fd2db34763535b.tar.gz | |
Merge pull request #30693 from Chaosus/lerp_angle
Added lerp_angle built-in function
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 25a40c70bf..15eea1d308 100644 --- a/core/math/expression.cpp +++ b/core/math/expression.cpp @@ -68,6 +68,7 @@ const char *Expression::func_name[Expression::FUNC_MAX] = { "step_decimals", "stepify", "lerp", + "lerp_angle", "inverse_lerp", "range_lerp", "smoothstep", @@ -190,6 +191,7 @@ int Expression::get_func_argument_count(BuiltinFunc p_func) { case COLORN: return 2; case MATH_LERP: + case MATH_LERP_ANGLE: case MATH_INVERSE_LERP: case MATH_SMOOTHSTEP: case MATH_MOVE_TOWARD: @@ -395,6 +397,13 @@ void Expression::exec_func(BuiltinFunc p_func, const Variant **p_inputs, Variant VALIDATE_ARG_NUM(2); *r_return = Math::lerp((double)*p_inputs[0], (double)*p_inputs[1], (double)*p_inputs[2]); } break; + case MATH_LERP_ANGLE: { + + VALIDATE_ARG_NUM(0); + VALIDATE_ARG_NUM(1); + VALIDATE_ARG_NUM(2); + *r_return = Math::lerp_angle((double)*p_inputs[0], (double)*p_inputs[1], (double)*p_inputs[2]); + } break; case MATH_INVERSE_LERP: { VALIDATE_ARG_NUM(0); |