diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-07-29 12:45:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 12:45:18 +0200 |
| commit | cd24fb848e5727ebc7ccbcd0fc94112c6baed4f2 (patch) | |
| tree | e5ab7a22d353c90ca2473d63c959e891e3417543 | |
| parent | 8b454f8b418a0b36a9f121ca9a8cf51c4ab53e41 (diff) | |
| parent | ee6fd704b5373c6f430a1f1f3a08505e0418b0c4 (diff) | |
Merge pull request #63617 from KoBeWi/v3c70r4
| -rw-r--r-- | core/variant/variant_parser.cpp | 4 | ||||
| -rw-r--r-- | doc/classes/Projection.xml | 8 | ||||
| -rw-r--r-- | doc/classes/Vector4.xml | 6 | ||||
| -rw-r--r-- | doc/classes/Vector4i.xml | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/core/variant/variant_parser.cpp b/core/variant/variant_parser.cpp index 1df5fa969e..34653310b1 100644 --- a/core/variant/variant_parser.cpp +++ b/core/variant/variant_parser.cpp @@ -1575,11 +1575,11 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str } break; case Variant::VECTOR4: { 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; case Variant::VECTOR4I: { 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; case Variant::PLANE: { Plane p = p_variant; diff --git a/doc/classes/Projection.xml b/doc/classes/Projection.xml index 115015c2d7..2bbfd04e9e 100644 --- a/doc/classes/Projection.xml +++ b/doc/classes/Projection.xml @@ -211,13 +211,13 @@ </method> </methods> <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 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 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 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> </members> <constants> diff --git a/doc/classes/Vector4.xml b/doc/classes/Vector4.xml index 4df3bbb80e..da0df2672e 100644 --- a/doc/classes/Vector4.xml +++ b/doc/classes/Vector4.xml @@ -173,13 +173,13 @@ <constant name="AXIS_W" value="3"> Enumerated value for the W axis. Returned by [method max_axis_index] and [method min_axis_index]. </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]. </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]. </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]. </constant> </constants> diff --git a/doc/classes/Vector4i.xml b/doc/classes/Vector4i.xml index 3611b17757..6acce12e9f 100644 --- a/doc/classes/Vector4i.xml +++ b/doc/classes/Vector4i.xml @@ -92,9 +92,9 @@ </constant> <constant name="AXIS_W" value="3"> </constant> - <constant name="ZERO" value="Vector4i(0, 0, 0)"> + <constant name="ZERO" value="Vector4i(0, 0, 0, 0)"> </constant> - <constant name="ONE" value="Vector4i(1, 1, 1)"> + <constant name="ONE" value="Vector4i(1, 1, 1, 1)"> </constant> </constants> <operators> |