diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-11-22 21:25:32 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-11-25 21:10:32 +0100 |
| commit | f2f48aaf36507bb1ade6261905296bfd560e921d (patch) | |
| tree | 98b4b6213c3fe5d96dd6a645daa9a815566732bf | |
| parent | d09d82d433b03bb3773fd2a8cc8d6ccc2f8739ce (diff) | |
| download | redot-engine-f2f48aaf36507bb1ade6261905296bfd560e921d.tar.gz | |
Fix stringification of Projection
| -rw-r--r-- | core/math/projection.cpp | 12 | ||||
| -rw-r--r-- | modules/gdscript/tests/scripts/runtime/features/stringify.gd | 1 | ||||
| -rw-r--r-- | modules/gdscript/tests/scripts/runtime/features/stringify.out | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/core/math/projection.cpp b/core/math/projection.cpp index 4a0faef08f..20638826a6 100644 --- a/core/math/projection.cpp +++ b/core/math/projection.cpp @@ -912,14 +912,10 @@ void Projection::set_light_atlas_rect(const Rect2 &p_rect) { } Projection::operator String() const { - String str; - for (int i = 0; i < 4; i++) { - for (int j = 0; j < 4; j++) { - str += String((j > 0) ? ", " : "\n") + rtos(columns[i][j]); - } - } - - return str; + return "[X: " + columns[0].operator String() + + ", Y: " + columns[1].operator String() + + ", Z: " + columns[2].operator String() + + ", W: " + columns[3].operator String() + "]"; } real_t Projection::get_aspect() const { diff --git a/modules/gdscript/tests/scripts/runtime/features/stringify.gd b/modules/gdscript/tests/scripts/runtime/features/stringify.gd index 463d207e59..69aecec6a8 100644 --- a/modules/gdscript/tests/scripts/runtime/features/stringify.gd +++ b/modules/gdscript/tests/scripts/runtime/features/stringify.gd @@ -22,6 +22,7 @@ func test(): print(AABB(Vector3.ZERO, Vector3.ONE)) print(Basis.from_euler(Vector3(0, 0, 0))) print(Transform3D.IDENTITY) + print(Projection.IDENTITY) print(Color(1, 2, 3, 4)) print(StringName("hello")) diff --git a/modules/gdscript/tests/scripts/runtime/features/stringify.out b/modules/gdscript/tests/scripts/runtime/features/stringify.out index 9983366db0..b044f8105d 100644 --- a/modules/gdscript/tests/scripts/runtime/features/stringify.out +++ b/modules/gdscript/tests/scripts/runtime/features/stringify.out @@ -17,6 +17,7 @@ hello world [P: (0.0, 0.0, 0.0), S: (1.0, 1.0, 1.0)] [X: (1.0, 0.0, 0.0), Y: (0.0, 1.0, 0.0), Z: (0.0, 0.0, 1.0)] [X: (1.0, 0.0, 0.0), Y: (0.0, 1.0, 0.0), Z: (0.0, 0.0, 1.0), O: (0.0, 0.0, 0.0)] +[X: (1.0, 0.0, 0.0, 0.0), Y: (0.0, 1.0, 0.0, 0.0), Z: (0.0, 0.0, 1.0, 0.0), W: (0.0, 0.0, 0.0, 1.0)] (1.0, 2.0, 3.0, 4.0) hello hello/world |