diff options
| author | Thaddeus Crews <repiteo@outlook.com> | 2024-11-26 13:04:58 -0600 |
|---|---|---|
| committer | Thaddeus Crews <repiteo@outlook.com> | 2024-11-26 13:04:58 -0600 |
| commit | 13d59b28c17c2f93b3de01a3e818a4e72ab8a29d (patch) | |
| tree | c3d46d8e02083cc343bf2198228f53b04693d369 | |
| parent | 1606b18673ea2aae53e27a46b45e4ce2bea1e5b7 (diff) | |
| parent | f2f48aaf36507bb1ade6261905296bfd560e921d (diff) | |
| download | redot-engine-13d59b28c17c2f93b3de01a3e818a4e72ab8a29d.tar.gz | |
Merge pull request #99563 from akien-mga/fix-projection-stringification
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 |