diff options
| author | Chaosus <chaosus89@gmail.com> | 2019-07-14 07:30:45 +0300 |
|---|---|---|
| committer | Chaosus <chaosus89@gmail.com> | 2019-07-20 12:59:41 +0300 |
| commit | 6694c119d069d8ff8dc5290d38d2d33625f07807 (patch) | |
| tree | 085f1fd73f885c29d417993d1c1a8ff0a3380bd9 /core/math/expression.cpp | |
| parent | c317a3ce16a35b21d85b250a0e810526bb89db38 (diff) | |
| download | redot-engine-6694c119d069d8ff8dc5290d38d2d33625f07807.tar.gz | |
Added lerp_angles built-in function
Co-authored-by: Xrayez <https://github.com/Xrayez>
Co-authored-by: DleanJeans <https://github.com/DleanJeans>
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 2786229cf3..4552278c17 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); |