From e210313045cc4de77c654f7cabf4c810c957f3fe Mon Sep 17 00:00:00 2001 From: kobewi Date: Fri, 22 Nov 2024 21:44:27 +0100 Subject: [PATCH] Fix stringification of Vector4 --- core/math/vector4.cpp | 2 +- .../tests/scripts/runtime/features/stringify.gd | 9 ++++++--- .../tests/scripts/runtime/features/stringify.out | 10 ++++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/core/math/vector4.cpp b/core/math/vector4.cpp index b6b914f36dab..8ac2c4bf1f17 100644 --- a/core/math/vector4.cpp +++ b/core/math/vector4.cpp @@ -213,7 +213,7 @@ Vector4 Vector4::clampf(real_t p_min, real_t p_max) const { } Vector4::operator String() const { - return "(" + String::num_real(x, false) + ", " + String::num_real(y, false) + ", " + String::num_real(z, false) + ", " + String::num_real(w, false) + ")"; + return "(" + String::num_real(x, true) + ", " + String::num_real(y, true) + ", " + String::num_real(z, true) + ", " + String::num_real(w, true) + ")"; } static_assert(sizeof(Vector4) == 4 * sizeof(real_t)); diff --git a/modules/gdscript/tests/scripts/runtime/features/stringify.gd b/modules/gdscript/tests/scripts/runtime/features/stringify.gd index 8579baf8766d..463d207e5910 100644 --- a/modules/gdscript/tests/scripts/runtime/features/stringify.gd +++ b/modules/gdscript/tests/scripts/runtime/features/stringify.gd @@ -4,15 +4,18 @@ func test(): print(-1.25, 0.25, 1.25) print("hello world") - print(Vector2(0.25, 0.25)) + print(Vector2(0.25, 1)) print(Vector2i(0, 0)) - print(Rect2(0.25, 0.25, 0.5, 0.5)) + print(Rect2(0.25, 0.25, 0.5, 1)) print(Rect2i(0, 0, 0, 0)) - print(Vector3(0.25, 0.25, 0.25)) + print(Vector3(0.25, 0.25, 1)) print(Vector3i(0, 0, 0)) + print(Vector4(0.25, 0.25, 0.25, 1)) + print(Vector4i(0, 0, 0, 0)) + print(Transform2D.IDENTITY) print(Plane(1, 2, 3, 4)) print(Quaternion(1, 2, 3, 4)) diff --git a/modules/gdscript/tests/scripts/runtime/features/stringify.out b/modules/gdscript/tests/scripts/runtime/features/stringify.out index 2463d70ef428..9983366db033 100644 --- a/modules/gdscript/tests/scripts/runtime/features/stringify.out +++ b/modules/gdscript/tests/scripts/runtime/features/stringify.out @@ -3,12 +3,14 @@ truefalse -101 -1.250.251.25 hello world -(0.25, 0.25) +(0.25, 1.0) (0, 0) -[P: (0.25, 0.25), S: (0.5, 0.5)] +[P: (0.25, 0.25), S: (0.5, 1.0)] [P: (0, 0), S: (0, 0)] -(0.25, 0.25, 0.25) +(0.25, 0.25, 1.0) (0, 0, 0) +(0.25, 0.25, 0.25, 1.0) +(0, 0, 0, 0) [X: (1.0, 0.0), Y: (0.0, 1.0), O: (0.0, 0.0)] [N: (1.0, 2.0, 3.0), D: 4] (1, 2, 3, 4) @@ -32,4 +34,4 @@ Node::[signal]property_list_changed [(1.0, 1.0), (0.0, 0.0)] [(1.0, 1.0, 1.0), (0.0, 0.0, 0.0)] [(1.0, 0.0, 0.0, 1.0), (0.0, 0.0, 1.0, 1.0), (0.0, 1.0, 0.0, 1.0)] -[(1, 1, 1, 1), (0, 0, 0, 0)] +[(1.0, 1.0, 1.0, 1.0), (0.0, 0.0, 0.0, 0.0)]