瀏覽代碼

Merge pull request #22165 from DualMatrix/atan2_plain_wrong

Fixed argument names having wrong order for atan2
Rémi Verschelde 7 年之前
父節點
當前提交
4075c80ea9
共有 2 個文件被更改,包括 7 次插入2 次删除
  1. 1 1
      modules/gdscript/gdscript_functions.cpp
  2. 6 1
      modules/visual_script/visual_script_builtin_funcs.cpp

+ 1 - 1
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;

+ 6 - 1
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)