浏览代码

Remove cartesian2polar and polar2cartesian

kobewi 3 年之前
父节点
当前提交
017c94222e

+ 0 - 11
core/variant/variant_utility.cpp

@@ -267,14 +267,6 @@ struct VariantUtilityFunctions {
 		return Math::db2linear(db);
 	}
 
-	static inline Vector2 polar2cartesian(double r, double th) {
-		return Vector2(r * Math::cos(th), r * Math::sin(th));
-	}
-
-	static inline Vector2 cartesian2polar(double x, double y) {
-		return Vector2(Math::sqrt(x * x + y * y), Math::atan2(y, x));
-	}
-
 	static inline int64_t wrapi(int64_t value, int64_t min, int64_t max) {
 		return Math::wrapi(value, min, max);
 	}
@@ -1214,9 +1206,6 @@ void Variant::_register_variant_utility_functions() {
 	FUNCBINDR(linear2db, sarray("lin"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(db2linear, sarray("db"), Variant::UTILITY_FUNC_TYPE_MATH);
 
-	FUNCBINDR(polar2cartesian, sarray("r", "th"), Variant::UTILITY_FUNC_TYPE_MATH);
-	FUNCBINDR(cartesian2polar, sarray("x", "y"), Variant::UTILITY_FUNC_TYPE_MATH);
-
 	FUNCBINDR(wrapi, sarray("value", "min", "max"), Variant::UTILITY_FUNC_TYPE_MATH);
 	FUNCBINDR(wrapf, sarray("value", "min", "max"), Variant::UTILITY_FUNC_TYPE_MATH);
 

+ 0 - 16
doc/classes/@GlobalScope.xml

@@ -99,14 +99,6 @@
 				[b]Warning:[/b] Deserialized object can contain code which gets executed. Do not use this option if the serialized object comes from untrusted sources to avoid potential security threats (remote code execution).
 			</description>
 		</method>
-		<method name="cartesian2polar">
-			<return type="Vector2" />
-			<argument index="0" name="x" type="float" />
-			<argument index="1" name="y" type="float" />
-			<description>
-				Converts a 2D point expressed in the cartesian coordinate system (X and Y axis) to the polar coordinate system (a distance from the origin and an angle).
-			</description>
-		</method>
 		<method name="ceil">
 			<return type="float" />
 			<argument index="0" name="x" type="float" />
@@ -521,14 +513,6 @@
 				[b]Warning:[/b] Due to the way it is implemented, this function returns [code]0[/code] rather than [code]1[/code] for non-positive values of [code]value[/code] (in reality, 1 is the smallest integer power of 2).
 			</description>
 		</method>
-		<method name="polar2cartesian">
-			<return type="Vector2" />
-			<argument index="0" name="r" type="float" />
-			<argument index="1" name="th" type="float" />
-			<description>
-				Converts a 2D point expressed in the polar coordinate system (a distance from the origin [code]r[/code] and an angle [code]th[/code]) to the cartesian coordinate system (X and Y axis).
-			</description>
-		</method>
 		<method name="posmod">
 			<return type="int" />
 			<argument index="0" name="x" type="int" />

+ 0 - 26
modules/mono/glue/GodotSharp/GodotSharp/Core/Mathf.cs

@@ -109,19 +109,6 @@ namespace Godot
             return (real_t)Math.Atan2(y, x);
         }
 
-        /// <summary>
-        /// Converts a 2D point expressed in the cartesian coordinate
-        /// system (X and Y axis) to the polar coordinate system
-        /// (a distance from the origin and an angle).
-        /// </summary>
-        /// <param name="x">The input X coordinate.</param>
-        /// <param name="y">The input Y coordinate.</param>
-        /// <returns>A <see cref="Vector2"/> with X representing the distance and Y representing the angle.</returns>
-        public static Vector2 Cartesian2Polar(real_t x, real_t y)
-        {
-            return new Vector2(Sqrt(x * x + y * y), Atan2(y, x));
-        }
-
         /// <summary>
         /// Rounds `s` upward (towards positive infinity).
         /// </summary>
@@ -435,19 +422,6 @@ namespace Godot
             return value;
         }
 
-        /// <summary>
-        /// Converts a 2D point expressed in the polar coordinate
-        /// system (a distance from the origin `r` and an angle `th`)
-        /// to the cartesian coordinate system (X and Y axis).
-        /// </summary>
-        /// <param name="r">The distance from the origin.</param>
-        /// <param name="th">The angle of the point.</param>
-        /// <returns>A <see cref="Vector2"/> representing the cartesian coordinate.</returns>
-        public static Vector2 Polar2Cartesian(real_t r, real_t th)
-        {
-            return new Vector2(r * Cos(th), r * Sin(th));
-        }
-
         /// <summary>
         /// Performs a canonical Modulus operation, where the output is on the range `[0, b)`.
         /// </summary>

+ 24 - 30
modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml

@@ -138,81 +138,75 @@
 		<constant name="MATH_DB2LINEAR" value="40" enum="BuiltinFunc">
 			Convert the input from decibel volume to linear volume.
 		</constant>
-		<constant name="MATH_POLAR2CARTESIAN" value="41" enum="BuiltinFunc">
-			Converts a 2D point expressed in the polar coordinate system (a distance from the origin [code]r[/code] and an angle [code]th[/code]) to the cartesian coordinate system (X and Y axis).
+		<constant name="MATH_WRAP" value="41" enum="BuiltinFunc">
 		</constant>
-		<constant name="MATH_CARTESIAN2POLAR" value="42" enum="BuiltinFunc">
-			Converts a 2D point expressed in the cartesian coordinate system (X and Y axis) to the polar coordinate system (a distance from the origin and an angle).
+		<constant name="MATH_WRAPF" value="42" enum="BuiltinFunc">
 		</constant>
-		<constant name="MATH_WRAP" value="43" enum="BuiltinFunc">
-		</constant>
-		<constant name="MATH_WRAPF" value="44" enum="BuiltinFunc">
-		</constant>
-		<constant name="LOGIC_MAX" value="45" enum="BuiltinFunc">
+		<constant name="LOGIC_MAX" value="43" enum="BuiltinFunc">
 			Return the greater of the two numbers, also known as their maximum.
 		</constant>
-		<constant name="LOGIC_MIN" value="46" enum="BuiltinFunc">
+		<constant name="LOGIC_MIN" value="44" enum="BuiltinFunc">
 			Return the lesser of the two numbers, also known as their minimum.
 		</constant>
-		<constant name="LOGIC_CLAMP" value="47" enum="BuiltinFunc">
+		<constant name="LOGIC_CLAMP" value="45" enum="BuiltinFunc">
 			Return the input clamped inside the given range, ensuring the result is never outside it. Equivalent to [code]min(max(input, range_low), range_high)[/code].
 		</constant>
-		<constant name="LOGIC_NEAREST_PO2" value="48" enum="BuiltinFunc">
+		<constant name="LOGIC_NEAREST_PO2" value="46" enum="BuiltinFunc">
 			Return the nearest power of 2 to the input.
 		</constant>
-		<constant name="OBJ_WEAKREF" value="49" enum="BuiltinFunc">
+		<constant name="OBJ_WEAKREF" value="47" enum="BuiltinFunc">
 			Create a [WeakRef] from the input.
 		</constant>
-		<constant name="TYPE_CONVERT" value="50" enum="BuiltinFunc">
+		<constant name="TYPE_CONVERT" value="48" enum="BuiltinFunc">
 			Convert between types.
 		</constant>
-		<constant name="TYPE_OF" value="51" enum="BuiltinFunc">
+		<constant name="TYPE_OF" value="49" enum="BuiltinFunc">
 			Return the type of the input as an integer. Check [enum Variant.Type] for the integers that might be returned.
 		</constant>
-		<constant name="TYPE_EXISTS" value="52" enum="BuiltinFunc">
+		<constant name="TYPE_EXISTS" value="50" enum="BuiltinFunc">
 			Checks if a type is registered in the [ClassDB].
 		</constant>
-		<constant name="TEXT_CHAR" value="53" enum="BuiltinFunc">
+		<constant name="TEXT_CHAR" value="51" enum="BuiltinFunc">
 			Return a character with the given ascii value.
 		</constant>
-		<constant name="TEXT_STR" value="54" enum="BuiltinFunc">
+		<constant name="TEXT_STR" value="52" enum="BuiltinFunc">
 			Convert the input to a string.
 		</constant>
-		<constant name="TEXT_PRINT" value="55" enum="BuiltinFunc">
+		<constant name="TEXT_PRINT" value="53" enum="BuiltinFunc">
 			Print the given string to the output window.
 		</constant>
-		<constant name="TEXT_PRINTERR" value="56" enum="BuiltinFunc">
+		<constant name="TEXT_PRINTERR" value="54" enum="BuiltinFunc">
 			Print the given string to the standard error output.
 		</constant>
-		<constant name="TEXT_PRINTRAW" value="57" enum="BuiltinFunc">
+		<constant name="TEXT_PRINTRAW" value="55" enum="BuiltinFunc">
 			Print the given string to the standard output, without adding a newline.
 		</constant>
-		<constant name="VAR_TO_STR" value="58" enum="BuiltinFunc">
+		<constant name="VAR_TO_STR" value="56" enum="BuiltinFunc">
 			Serialize a [Variant] to a string.
 		</constant>
-		<constant name="STR_TO_VAR" value="59" enum="BuiltinFunc">
+		<constant name="STR_TO_VAR" value="57" enum="BuiltinFunc">
 			Deserialize a [Variant] from a string serialized using [constant VAR_TO_STR].
 		</constant>
-		<constant name="VAR_TO_BYTES" value="60" enum="BuiltinFunc">
+		<constant name="VAR_TO_BYTES" value="58" enum="BuiltinFunc">
 			Serialize a [Variant] to a [PackedByteArray].
 		</constant>
-		<constant name="BYTES_TO_VAR" value="61" enum="BuiltinFunc">
+		<constant name="BYTES_TO_VAR" value="59" enum="BuiltinFunc">
 			Deserialize a [Variant] from a [PackedByteArray] serialized using [constant VAR_TO_BYTES].
 		</constant>
-		<constant name="MATH_SMOOTHSTEP" value="62" enum="BuiltinFunc">
+		<constant name="MATH_SMOOTHSTEP" value="60" enum="BuiltinFunc">
 			Return a number smoothly interpolated between the first two inputs, based on the third input. Similar to [constant MATH_LERP], but interpolates faster at the beginning and slower at the end. Using Hermite interpolation formula:
 			[codeblock]
 			var t = clamp((weight - from) / (to - from), 0.0, 1.0)
 			return t * t * (3.0 - 2.0 * t)
 			[/codeblock]
 		</constant>
-		<constant name="MATH_POSMOD" value="63" enum="BuiltinFunc">
+		<constant name="MATH_POSMOD" value="61" enum="BuiltinFunc">
 		</constant>
-		<constant name="MATH_LERP_ANGLE" value="64" enum="BuiltinFunc">
+		<constant name="MATH_LERP_ANGLE" value="62" enum="BuiltinFunc">
 		</constant>
-		<constant name="TEXT_ORD" value="65" enum="BuiltinFunc">
+		<constant name="TEXT_ORD" value="63" enum="BuiltinFunc">
 		</constant>
-		<constant name="FUNC_MAX" value="66" enum="BuiltinFunc">
+		<constant name="FUNC_MAX" value="64" enum="BuiltinFunc">
 			Represents the size of the [enum BuiltinFunc] enum.
 		</constant>
 	</constants>

+ 0 - 40
modules/visual_script/visual_script_builtin_funcs.cpp

@@ -79,8 +79,6 @@ const char *VisualScriptBuiltinFunc::func_name[VisualScriptBuiltinFunc::FUNC_MAX
 	"rad2deg",
 	"linear2db",
 	"db2linear",
-	"polar2cartesian",
-	"cartesian2polar",
 	"wrapi",
 	"wrapf",
 	"max",
@@ -194,8 +192,6 @@ int VisualScriptBuiltinFunc::get_func_argument_count(BuiltinFunc p_func) {
 		case MATH_SNAPPED:
 		case MATH_RANDF_RANGE:
 		case MATH_RANDI_RANGE:
-		case MATH_POLAR2CARTESIAN:
-		case MATH_CARTESIAN2POLAR:
 		case LOGIC_MAX:
 		case LOGIC_MIN:
 		case TYPE_CONVERT:
@@ -381,20 +377,6 @@ PropertyInfo VisualScriptBuiltinFunc::get_input_value_port_info(int p_idx) const
 		case MATH_DB2LINEAR: {
 			return PropertyInfo(Variant::FLOAT, "db");
 		} break;
-		case MATH_POLAR2CARTESIAN: {
-			if (p_idx == 0) {
-				return PropertyInfo(Variant::FLOAT, "r");
-			} else {
-				return PropertyInfo(Variant::FLOAT, "th");
-			}
-		} break;
-		case MATH_CARTESIAN2POLAR: {
-			if (p_idx == 0) {
-				return PropertyInfo(Variant::FLOAT, "x");
-			} else {
-				return PropertyInfo(Variant::FLOAT, "y");
-			}
-		} break;
 		case MATH_WRAP: {
 			if (p_idx == 0) {
 				return PropertyInfo(Variant::INT, "value");
@@ -553,10 +535,6 @@ PropertyInfo VisualScriptBuiltinFunc::get_output_value_port_info(int p_idx) cons
 		case MATH_DB2LINEAR: {
 			t = Variant::FLOAT;
 		} break;
-		case MATH_POLAR2CARTESIAN:
-		case MATH_CARTESIAN2POLAR: {
-			t = Variant::VECTOR2;
-		} break;
 		case MATH_WRAP: {
 			t = Variant::INT;
 		} break;
@@ -874,20 +852,6 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in
 			VALIDATE_ARG_NUM(0);
 			*r_return = Math::db2linear((double)*p_inputs[0]);
 		} break;
-		case VisualScriptBuiltinFunc::MATH_POLAR2CARTESIAN: {
-			VALIDATE_ARG_NUM(0);
-			VALIDATE_ARG_NUM(1);
-			double r = *p_inputs[0];
-			double th = *p_inputs[1];
-			*r_return = Vector2(r * Math::cos(th), r * Math::sin(th));
-		} break;
-		case VisualScriptBuiltinFunc::MATH_CARTESIAN2POLAR: {
-			VALIDATE_ARG_NUM(0);
-			VALIDATE_ARG_NUM(1);
-			double x = *p_inputs[0];
-			double y = *p_inputs[1];
-			*r_return = Vector2(Math::sqrt(x * x + y * y), Math::atan2(y, x));
-		} break;
 		case VisualScriptBuiltinFunc::MATH_WRAP: {
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
@@ -1229,8 +1193,6 @@ void VisualScriptBuiltinFunc::_bind_methods() {
 	BIND_ENUM_CONSTANT(MATH_RAD2DEG);
 	BIND_ENUM_CONSTANT(MATH_LINEAR2DB);
 	BIND_ENUM_CONSTANT(MATH_DB2LINEAR);
-	BIND_ENUM_CONSTANT(MATH_POLAR2CARTESIAN);
-	BIND_ENUM_CONSTANT(MATH_CARTESIAN2POLAR);
 	BIND_ENUM_CONSTANT(MATH_WRAP);
 	BIND_ENUM_CONSTANT(MATH_WRAPF);
 	BIND_ENUM_CONSTANT(LOGIC_MAX);
@@ -1320,8 +1282,6 @@ void register_visual_script_builtin_func_node() {
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/rad2deg", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_RAD2DEG>);
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/linear2db", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_LINEAR2DB>);
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/db2linear", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_DB2LINEAR>);
-	VisualScriptLanguage::singleton->add_register_func("functions/built_in/polar2cartesian", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_POLAR2CARTESIAN>);
-	VisualScriptLanguage::singleton->add_register_func("functions/built_in/cartesian2polar", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_CARTESIAN2POLAR>);
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/wrapi", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_WRAP>);
 	VisualScriptLanguage::singleton->add_register_func("functions/built_in/wrapf", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_WRAPF>);
 

+ 0 - 2
modules/visual_script/visual_script_builtin_funcs.h

@@ -79,8 +79,6 @@ public:
 		MATH_RAD2DEG,
 		MATH_LINEAR2DB,
 		MATH_DB2LINEAR,
-		MATH_POLAR2CARTESIAN,
-		MATH_CARTESIAN2POLAR,
 		MATH_WRAP,
 		MATH_WRAPF,
 		LOGIC_MAX,