Browse Source

Merge pull request #63617 from KoBeWi/v3c70r4

Rémi Verschelde 3 years ago
parent
commit
cd24fb848e

+ 2 - 2
core/variant/variant_parser.cpp

@@ -1575,11 +1575,11 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str
 		} break;
 		} break;
 		case Variant::VECTOR4: {
 		case Variant::VECTOR4: {
 			Vector4 v = p_variant;
 			Vector4 v = p_variant;
-			p_store_string_func(p_store_string_ud, "Vector4(" + rtos_fix(v.x) + ", " + rtos_fix(v.y) + ", " + rtos_fix(v.z) + ")");
+			p_store_string_func(p_store_string_ud, "Vector4(" + rtos_fix(v.x) + ", " + rtos_fix(v.y) + ", " + rtos_fix(v.z) + ", " + rtos_fix(v.w) + ")");
 		} break;
 		} break;
 		case Variant::VECTOR4I: {
 		case Variant::VECTOR4I: {
 			Vector4i v = p_variant;
 			Vector4i v = p_variant;
-			p_store_string_func(p_store_string_ud, "Vector4i(" + itos(v.x) + ", " + itos(v.y) + ", " + itos(v.z) + ")");
+			p_store_string_func(p_store_string_ud, "Vector4i(" + itos(v.x) + ", " + itos(v.y) + ", " + itos(v.z) + ", " + itos(v.w) + ")");
 		} break;
 		} break;
 		case Variant::PLANE: {
 		case Variant::PLANE: {
 			Plane p = p_variant;
 			Plane p = p_variant;

+ 4 - 4
doc/classes/Projection.xml

@@ -211,13 +211,13 @@
 		</method>
 		</method>
 	</methods>
 	</methods>
 	<members>
 	<members>
-		<member name="w" type="Vector4" setter="" getter="" default="Vector4(0, 0, 0)">
+		<member name="w" type="Vector4" setter="" getter="" default="Vector4(0, 0, 0, 1)">
 		</member>
 		</member>
-		<member name="x" type="Vector4" setter="" getter="" default="Vector4(1, 0, 0)">
+		<member name="x" type="Vector4" setter="" getter="" default="Vector4(1, 0, 0, 0)">
 		</member>
 		</member>
-		<member name="y" type="Vector4" setter="" getter="" default="Vector4(0, 1, 0)">
+		<member name="y" type="Vector4" setter="" getter="" default="Vector4(0, 1, 0, 0)">
 		</member>
 		</member>
-		<member name="z" type="Vector4" setter="" getter="" default="Vector4(0, 0, 1)">
+		<member name="z" type="Vector4" setter="" getter="" default="Vector4(0, 0, 1, 0)">
 		</member>
 		</member>
 	</members>
 	</members>
 	<constants>
 	<constants>

+ 3 - 3
doc/classes/Vector4.xml

@@ -173,13 +173,13 @@
 		<constant name="AXIS_W" value="3">
 		<constant name="AXIS_W" value="3">
 			Enumerated value for the W axis. Returned by [method max_axis_index] and [method min_axis_index].
 			Enumerated value for the W axis. Returned by [method max_axis_index] and [method min_axis_index].
 		</constant>
 		</constant>
-		<constant name="ZERO" value="Vector4(0, 0, 0)">
+		<constant name="ZERO" value="Vector4(0, 0, 0, 0)">
 			Zero vector, a vector with all components set to [code]0[/code].
 			Zero vector, a vector with all components set to [code]0[/code].
 		</constant>
 		</constant>
-		<constant name="ONE" value="Vector4(1, 1, 1)">
+		<constant name="ONE" value="Vector4(1, 1, 1, 1)">
 			One vector, a vector with all components set to [code]1[/code].
 			One vector, a vector with all components set to [code]1[/code].
 		</constant>
 		</constant>
-		<constant name="INF" value="Vector4(inf, inf, inf)">
+		<constant name="INF" value="Vector4(inf, inf, inf, inf)">
 			Infinity vector, a vector with all components set to [constant @GDScript.INF].
 			Infinity vector, a vector with all components set to [constant @GDScript.INF].
 		</constant>
 		</constant>
 	</constants>
 	</constants>

+ 2 - 2
doc/classes/Vector4i.xml

@@ -92,9 +92,9 @@
 		</constant>
 		</constant>
 		<constant name="AXIS_W" value="3">
 		<constant name="AXIS_W" value="3">
 		</constant>
 		</constant>
-		<constant name="ZERO" value="Vector4i(0, 0, 0)">
+		<constant name="ZERO" value="Vector4i(0, 0, 0, 0)">
 		</constant>
 		</constant>
-		<constant name="ONE" value="Vector4i(1, 1, 1)">
+		<constant name="ONE" value="Vector4i(1, 1, 1, 1)">
 		</constant>
 		</constant>
 	</constants>
 	</constants>
 	<operators>
 	<operators>