diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-17 12:33:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 12:33:26 +0200 |
| commit | 4075c80ea9b6876db0b6dea0035c2e941142f98e (patch) | |
| tree | 0426503d680a376760384464f56508e08630e5e5 | |
| parent | 7c95613b410a4bd002f393b8ebf37f4cdfc84c53 (diff) | |
| parent | 4bad2beeed5bf07db4c9d007a885a738c48a5498 (diff) | |
Merge pull request #22165 from DualMatrix/atan2_plain_wrong
Fixed argument names having wrong order for atan2
| -rw-r--r-- | modules/gdscript/gdscript_functions.cpp | 2 | ||||
| -rw-r--r-- | modules/visual_script/visual_script_builtin_funcs.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp index c469defb01..5af9bbc05f 100644 --- a/modules/gdscript/gdscript_functions.cpp +++ b/modules/gdscript/gdscript_functions.cpp @@ -1458,7 +1458,7 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) { return mi; } break; case MATH_ATAN2: { - MethodInfo mi("atan2", PropertyInfo(Variant::REAL, "x"), PropertyInfo(Variant::REAL, "y")); + MethodInfo mi("atan2", PropertyInfo(Variant::REAL, "y"), PropertyInfo(Variant::REAL, "x")); mi.return_val.type = Variant::REAL; return mi; } break; diff --git a/modules/visual_script/visual_script_builtin_funcs.cpp b/modules/visual_script/visual_script_builtin_funcs.cpp index e7a4e0c31f..60bc54afe4 100644 --- a/modules/visual_script/visual_script_builtin_funcs.cpp +++ b/modules/visual_script/visual_script_builtin_funcs.cpp @@ -260,7 +260,12 @@ PropertyInfo VisualScriptBuiltinFunc::get_input_value_port_info(int p_idx) const case MATH_SQRT: { return PropertyInfo(Variant::REAL, "s"); } break; - case MATH_ATAN2: + case MATH_ATAN2: { + if (p_idx == 0) + return PropertyInfo(Variant::REAL, "y"); + else + return PropertyInfo(Variant::REAL, "x"); + } break; case MATH_FMOD: case MATH_FPOSMOD: { if (p_idx == 0) |