diff options
17 files changed, 40 insertions, 100 deletions
diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Aabb.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Aabb.cs index 63af6ee6e8..feaa1d07da 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Aabb.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Aabb.cs @@ -733,10 +733,7 @@ namespace Godot /// Converts this <see cref="Aabb"/> to a string. /// </summary> /// <returns>A string representation of this AABB.</returns> - public override readonly string ToString() - { - return $"{_position}, {_size}"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Aabb"/> to a string with the given <paramref name="format"/>. diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs index 589d6596f0..8d24582ba1 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Basis.cs @@ -1134,10 +1134,7 @@ namespace Godot /// Converts this <see cref="Basis"/> to a string. /// </summary> /// <returns>A string representation of this basis.</returns> - public override readonly string ToString() - { - return $"[X: {X}, Y: {Y}, Z: {Z}]"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Basis"/> to a string with the given <paramref name="format"/>. diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs index a1f1ade9b8..d3b9f2d2ae 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Color.cs @@ -1329,10 +1329,7 @@ namespace Godot /// Converts this <see cref="Color"/> to a string. /// </summary> /// <returns>A string representation of this color.</returns> - public override readonly string ToString() - { - return $"({R}, {G}, {B}, {A})"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Color"/> to a string with the given <paramref name="format"/>. @@ -1340,9 +1337,7 @@ namespace Godot /// <returns>A string representation of this color.</returns> public readonly string ToString(string? format) { -#pragma warning disable CA1305 // Disable warning: "Specify IFormatProvider" - return $"({R.ToString(format)}, {G.ToString(format)}, {B.ToString(format)}, {A.ToString(format)})"; -#pragma warning restore CA1305 + return $"({R.ToString(format, CultureInfo.InvariantCulture)}, {G.ToString(format, CultureInfo.InvariantCulture)}, {B.ToString(format, CultureInfo.InvariantCulture)}, {A.ToString(format, CultureInfo.InvariantCulture)})"; } } } diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Plane.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Plane.cs index c5998eca5c..1f50a38e78 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Plane.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Plane.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.Runtime.InteropServices; #nullable enable @@ -424,10 +425,7 @@ namespace Godot /// Converts this <see cref="Plane"/> to a string. /// </summary> /// <returns>A string representation of this plane.</returns> - public override readonly string ToString() - { - return $"{_normal}, {_d}"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Plane"/> to a string with the given <paramref name="format"/>. @@ -435,9 +433,7 @@ namespace Godot /// <returns>A string representation of this plane.</returns> public readonly string ToString(string? format) { -#pragma warning disable CA1305 // Disable warning: "Specify IFormatProvider" - return $"{_normal.ToString(format)}, {_d.ToString(format)}"; -#pragma warning restore CA1305 + return $"{_normal.ToString(format)}, {_d.ToString(format, CultureInfo.InvariantCulture)}"; } } } diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Projection.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Projection.cs index c0889fb0e8..fed0eb5e78 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Projection.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Projection.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.Runtime.InteropServices; #nullable enable @@ -1012,10 +1013,7 @@ namespace Godot /// Converts this <see cref="Projection"/> to a string. /// </summary> /// <returns>A string representation of this projection.</returns> - public override readonly string ToString() - { - return $"{X.X}, {X.Y}, {X.Z}, {X.W}\n{Y.X}, {Y.Y}, {Y.Z}, {Y.W}\n{Z.X}, {Z.Y}, {Z.Z}, {Z.W}\n{W.X}, {W.Y}, {W.Z}, {W.W}\n"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Projection"/> to a string with the given <paramref name="format"/>. @@ -1023,12 +1021,10 @@ namespace Godot /// <returns>A string representation of this projection.</returns> public readonly string ToString(string? format) { -#pragma warning disable CA1305 // Disable warning: "Specify IFormatProvider" - return $"{X.X.ToString(format)}, {X.Y.ToString(format)}, {X.Z.ToString(format)}, {X.W.ToString(format)}\n" + - $"{Y.X.ToString(format)}, {Y.Y.ToString(format)}, {Y.Z.ToString(format)}, {Y.W.ToString(format)}\n" + - $"{Z.X.ToString(format)}, {Z.Y.ToString(format)}, {Z.Z.ToString(format)}, {Z.W.ToString(format)}\n" + - $"{W.X.ToString(format)}, {W.Y.ToString(format)}, {W.Z.ToString(format)}, {W.W.ToString(format)}\n"; -#pragma warning restore CA1305 + return $"{X.X.ToString(format, CultureInfo.InvariantCulture)}, {X.Y.ToString(format, CultureInfo.InvariantCulture)}, {X.Z.ToString(format, CultureInfo.InvariantCulture)}, {X.W.ToString(format, CultureInfo.InvariantCulture)}\n" + + $"{Y.X.ToString(format, CultureInfo.InvariantCulture)}, {Y.Y.ToString(format, CultureInfo.InvariantCulture)}, {Y.Z.ToString(format, CultureInfo.InvariantCulture)}, {Y.W.ToString(format, CultureInfo.InvariantCulture)}\n" + + $"{Z.X.ToString(format, CultureInfo.InvariantCulture)}, {Z.Y.ToString(format, CultureInfo.InvariantCulture)}, {Z.Z.ToString(format, CultureInfo.InvariantCulture)}, {Z.W.ToString(format, CultureInfo.InvariantCulture)}\n" + + $"{W.X.ToString(format, CultureInfo.InvariantCulture)}, {W.Y.ToString(format, CultureInfo.InvariantCulture)}, {W.Z.ToString(format, CultureInfo.InvariantCulture)}, {W.W.ToString(format, CultureInfo.InvariantCulture)}\n"; } } } diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Quaternion.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Quaternion.cs index 6a8cb1ba04..09511ebdca 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Quaternion.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Quaternion.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.Runtime.InteropServices; #nullable enable @@ -811,10 +812,7 @@ namespace Godot /// Converts this <see cref="Quaternion"/> to a string. /// </summary> /// <returns>A string representation of this quaternion.</returns> - public override readonly string ToString() - { - return $"({X}, {Y}, {Z}, {W})"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Quaternion"/> to a string with the given <paramref name="format"/>. @@ -822,9 +820,7 @@ namespace Godot /// <returns>A string representation of this quaternion.</returns> public readonly string ToString(string? format) { -#pragma warning disable CA1305 // Disable warning: "Specify IFormatProvider" - return $"({X.ToString(format)}, {Y.ToString(format)}, {Z.ToString(format)}, {W.ToString(format)})"; -#pragma warning restore CA1305 + return $"({X.ToString(format, CultureInfo.InvariantCulture)}, {Y.ToString(format, CultureInfo.InvariantCulture)}, {Z.ToString(format, CultureInfo.InvariantCulture)}, {W.ToString(format, CultureInfo.InvariantCulture)})"; } } } diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2.cs index cf4ac45a9f..9d9065911e 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2.cs @@ -469,10 +469,7 @@ namespace Godot /// Converts this <see cref="Rect2"/> to a string. /// </summary> /// <returns>A string representation of this rect.</returns> - public override readonly string ToString() - { - return $"{_position}, {_size}"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Rect2"/> to a string with the given <paramref name="format"/>. diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2I.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2I.cs index 58560df0c5..65704b3da7 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2I.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Rect2I.cs @@ -429,10 +429,7 @@ namespace Godot /// Converts this <see cref="Rect2I"/> to a string. /// </summary> /// <returns>A string representation of this rect.</returns> - public override readonly string ToString() - { - return $"{_position}, {_size}"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Rect2I"/> to a string with the given <paramref name="format"/>. diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Rid.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Rid.cs index fccae94eac..4f0015c7ae 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Rid.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Rid.cs @@ -1,8 +1,7 @@ using System; using System.Diagnostics.CodeAnalysis; -using System.Runtime.CompilerServices; +using System.Globalization; using System.Runtime.InteropServices; -using Godot.NativeInterop; #nullable enable @@ -102,6 +101,6 @@ namespace Godot /// Converts this <see cref="Rid"/> to a string. /// </summary> /// <returns>A string representation of this Rid.</returns> - public override string ToString() => $"RID({Id})"; + public override readonly string ToString() => $"RID({Id.ToString(null, CultureInfo.InvariantCulture)})"; } } diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform2D.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform2D.cs index 3443277fee..a5fa89d3bf 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform2D.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform2D.cs @@ -650,10 +650,7 @@ namespace Godot /// Converts this <see cref="Transform2D"/> to a string. /// </summary> /// <returns>A string representation of this transform.</returns> - public override readonly string ToString() - { - return $"[X: {X}, Y: {Y}, O: {Origin}]"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Transform2D"/> to a string with the given <paramref name="format"/>. diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs index f80c0bd8dd..0f534d477f 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs @@ -674,10 +674,7 @@ namespace Godot /// Converts this <see cref="Transform3D"/> to a string. /// </summary> /// <returns>A string representation of this transform.</returns> - public override readonly string ToString() - { - return $"[X: {Basis.X}, Y: {Basis.Y}, Z: {Basis.Z}, O: {Origin}]"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Transform3D"/> to a string with the given <paramref name="format"/>. diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs index 8f1bc109c0..856fd54352 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.Runtime.InteropServices; #nullable enable @@ -1016,10 +1017,7 @@ namespace Godot /// Converts this <see cref="Vector2"/> to a string. /// </summary> /// <returns>A string representation of this vector.</returns> - public override readonly string ToString() - { - return $"({X}, {Y})"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Vector2"/> to a string with the given <paramref name="format"/>. @@ -1027,9 +1025,7 @@ namespace Godot /// <returns>A string representation of this vector.</returns> public readonly string ToString(string? format) { -#pragma warning disable CA1305 // Disable warning: "Specify IFormatProvider" - return $"({X.ToString(format)}, {Y.ToString(format)})"; -#pragma warning restore CA1305 + return $"({X.ToString(format, CultureInfo.InvariantCulture)}, {Y.ToString(format, CultureInfo.InvariantCulture)})"; } } } diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2I.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2I.cs index 1a386d9da1..511cc7971c 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2I.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector2I.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.Runtime.InteropServices; #nullable enable @@ -589,10 +590,7 @@ namespace Godot /// Converts this <see cref="Vector2I"/> to a string. /// </summary> /// <returns>A string representation of this vector.</returns> - public override readonly string ToString() - { - return $"({X}, {Y})"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Vector2I"/> to a string with the given <paramref name="format"/>. @@ -600,9 +598,7 @@ namespace Godot /// <returns>A string representation of this vector.</returns> public readonly string ToString(string? format) { -#pragma warning disable CA1305 // Disable warning: "Specify IFormatProvider" - return $"({X.ToString(format)}, {Y.ToString(format)})"; -#pragma warning restore CA1305 + return $"({X.ToString(format, CultureInfo.InvariantCulture)}, {Y.ToString(format, CultureInfo.InvariantCulture)})"; } } } diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs index 74c1616e3d..6300705107 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.Runtime.InteropServices; #nullable enable @@ -1118,10 +1119,7 @@ namespace Godot /// Converts this <see cref="Vector3"/> to a string. /// </summary> /// <returns>A string representation of this vector.</returns> - public override readonly string ToString() - { - return $"({X}, {Y}, {Z})"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Vector3"/> to a string with the given <paramref name="format"/>. @@ -1129,9 +1127,7 @@ namespace Godot /// <returns>A string representation of this vector.</returns> public readonly string ToString(string? format) { -#pragma warning disable CA1305 // Disable warning: "Specify IFormatProvider" - return $"({X.ToString(format)}, {Y.ToString(format)}, {Z.ToString(format)})"; -#pragma warning restore CA1305 + return $"({X.ToString(format, CultureInfo.InvariantCulture)}, {Y.ToString(format, CultureInfo.InvariantCulture)}, {Z.ToString(format, CultureInfo.InvariantCulture)})"; } } } diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3I.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3I.cs index d0ad1922f6..aea46efc5b 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3I.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector3I.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.Runtime.InteropServices; #nullable enable @@ -644,10 +645,7 @@ namespace Godot /// Converts this <see cref="Vector3I"/> to a string. /// </summary> /// <returns>A string representation of this vector.</returns> - public override readonly string ToString() - { - return $"({X}, {Y}, {Z})"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Vector3I"/> to a string with the given <paramref name="format"/>. @@ -655,9 +653,7 @@ namespace Godot /// <returns>A string representation of this vector.</returns> public readonly string ToString(string? format) { -#pragma warning disable CA1305 // Disable warning: "Specify IFormatProvider" - return $"({X.ToString(format)}, {Y.ToString(format)}, {Z.ToString(format)})"; -#pragma warning restore CA1305 + return $"({X.ToString(format, CultureInfo.InvariantCulture)}, {Y.ToString(format, CultureInfo.InvariantCulture)}, {Z.ToString(format, CultureInfo.InvariantCulture)})"; } } } diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector4.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector4.cs index 115e65bbdb..7c4832943c 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector4.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector4.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.Runtime.InteropServices; #nullable enable @@ -894,10 +895,7 @@ namespace Godot /// Converts this <see cref="Vector4"/> to a string. /// </summary> /// <returns>A string representation of this vector.</returns> - public override string ToString() - { - return $"({X}, {Y}, {Z}, {W})"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Vector4"/> to a string with the given <paramref name="format"/>. @@ -905,9 +903,7 @@ namespace Godot /// <returns>A string representation of this vector.</returns> public readonly string ToString(string? format) { -#pragma warning disable CA1305 // Disable warning: "Specify IFormatProvider" - return $"({X.ToString(format)}, {Y.ToString(format)}, {Z.ToString(format)}, {W.ToString(format)})"; -#pragma warning restore CA1305 + return $"({X.ToString(format, CultureInfo.InvariantCulture)}, {Y.ToString(format, CultureInfo.InvariantCulture)}, {Z.ToString(format, CultureInfo.InvariantCulture)}, {W.ToString(format, CultureInfo.InvariantCulture)})"; } } } diff --git a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector4I.cs b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector4I.cs index 527c8e5022..27aa86b7e4 100644 --- a/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector4I.cs +++ b/modules/mono/glue/GodotSharp/GodotSharp/Core/Vector4I.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.Runtime.InteropServices; #nullable enable @@ -665,10 +666,7 @@ namespace Godot /// Converts this <see cref="Vector4I"/> to a string. /// </summary> /// <returns>A string representation of this vector.</returns> - public override readonly string ToString() - { - return $"({X}, {Y}, {Z}, {W})"; - } + public override readonly string ToString() => ToString(null); /// <summary> /// Converts this <see cref="Vector4I"/> to a string with the given <paramref name="format"/>. @@ -676,9 +674,7 @@ namespace Godot /// <returns>A string representation of this vector.</returns> public readonly string ToString(string? format) { -#pragma warning disable CA1305 // Disable warning: "Specify IFormatProvider" - return $"({X.ToString(format)}, {Y.ToString(format)}, {Z.ToString(format)}, {W.ToString(format)})"; -#pragma warning restore CA1305 + return $"({X.ToString(format, CultureInfo.InvariantCulture)}, {Y.ToString(format, CultureInfo.InvariantCulture)}, {Z.ToString(format, CultureInfo.InvariantCulture)}, {W.ToString(format, CultureInfo.InvariantCulture)})"; } } } |