From fe21c992dca44ea203f79de67749424c3245d992 Mon Sep 17 00:00:00 2001 From: Jelle <60387522+JelleInfinity@users.noreply.github.com> Date: Tue, 6 Dec 2022 23:14:05 +0100 Subject: [PATCH] Add `ToString()` for property display --- pkNX.Structures.FlatBuffers/Util/Math/AABB.cs | 2 ++ .../Util/Math/Packed/PackedAABB.cs | 13 +++++++++++++ .../Util/Math/Packed/PackedColor3f.cs | 14 ++++++++++++++ .../Util/Math/Packed/PackedColor4f.cs | 2 ++ .../Util/Math/Packed/PackedQuaternion.cs | 2 ++ .../Util/Math/Packed/PackedSphere.cs | 2 ++ .../Util/Math/Packed/PackedVec2f.cs | 2 ++ .../Util/Math/Packed/PackedVec3f.cs | 8 +++++--- .../Util/Math/Packed/PackedVec4f.cs | 4 ++++ pkNX.Structures.FlatBuffers/Util/Math/Transform.cs | 2 ++ 10 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedAABB.cs create mode 100644 pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedColor3f.cs diff --git a/pkNX.Structures.FlatBuffers/Util/Math/AABB.cs b/pkNX.Structures.FlatBuffers/Util/Math/AABB.cs index 7d8d1ae4..b619cdc4 100644 --- a/pkNX.Structures.FlatBuffers/Util/Math/AABB.cs +++ b/pkNX.Structures.FlatBuffers/Util/Math/AABB.cs @@ -12,4 +12,6 @@ public class AABB { [FlatBufferItem(0)] public PackedVec3f Min { get; set; } [FlatBufferItem(1)] public PackedVec3f Max { get; set; } + + public override string ToString() => $"{{ Min: {Min}, Max: {Max} }}"; } diff --git a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedAABB.cs b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedAABB.cs new file mode 100644 index 00000000..e737d3a1 --- /dev/null +++ b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedAABB.cs @@ -0,0 +1,13 @@ +using System.ComponentModel; +using FlatSharp.Attributes; + +namespace pkNX.Structures.FlatBuffers; + +[FlatBufferStruct, TypeConverter(typeof(ExpandableObjectConverter))] +public class PackedAABB +{ + [FlatBufferItem(0)] public PackedVec3f Min { get; set; } = new(); + [FlatBufferItem(1)] public PackedVec3f Max { get; set; } = new(); + + public override string ToString() => $"{{ Min: {Min}, Max: {Max} }}"; +} diff --git a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedColor3f.cs b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedColor3f.cs new file mode 100644 index 00000000..748580b5 --- /dev/null +++ b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedColor3f.cs @@ -0,0 +1,14 @@ +using System.ComponentModel; +using FlatSharp.Attributes; + +namespace pkNX.Structures.FlatBuffers; + +[FlatBufferStruct, TypeConverter(typeof(ExpandableObjectConverter))] +public class PackedColor3f +{ + [FlatBufferItem(00)] public float R { get; set; } = 0.0f; + [FlatBufferItem(01)] public float G { get; set; } = 0.0f; + [FlatBufferItem(02)] public float B { get; set; } = 0.0f; + + public override string ToString() => $"{{ R: {R}, G: {G}, B: {B} }}"; +} diff --git a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedColor4f.cs b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedColor4f.cs index f38b614e..71041041 100644 --- a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedColor4f.cs +++ b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedColor4f.cs @@ -10,4 +10,6 @@ public class PackedColor4f [FlatBufferItem(01)] public float G { get; set; } = 0.0f; [FlatBufferItem(02)] public float B { get; set; } = 0.0f; [FlatBufferItem(03)] public float A { get; set; } = 1.0f; + + public override string ToString() => $"{{ R: {R}, G: {G}, B: {B}, A: {A} }}"; } diff --git a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedQuaternion.cs b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedQuaternion.cs index 7a2956c4..72f7207f 100644 --- a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedQuaternion.cs +++ b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedQuaternion.cs @@ -10,4 +10,6 @@ public class PackedQuaternion [FlatBufferItem(1)] public float X { get; set; } = 0.0f; [FlatBufferItem(2)] public float Y { get; set; } = 0.0f; [FlatBufferItem(3)] public float Z { get; set; } = 0.0f; + + public override string ToString() => $"{{ W: {W}, X: {X}, Y: {Y}, Z: {Z} }}"; } diff --git a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedSphere.cs b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedSphere.cs index 5828c087..beb86d4a 100644 --- a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedSphere.cs +++ b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedSphere.cs @@ -8,4 +8,6 @@ public class PackedSphere { [FlatBufferItem(00)] public PackedVec3f Center { get; set; } = new(); [FlatBufferItem(01)] public float Radius { get; set; } + + public override string ToString() => $"{{ Radius: {Radius}, Center: {Center} }}"; } diff --git a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedVec2f.cs b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedVec2f.cs index 865d012a..5b5d95d1 100644 --- a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedVec2f.cs +++ b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedVec2f.cs @@ -8,4 +8,6 @@ public class PackedVec2f { [FlatBufferItem(0)] public float X { get; set; } [FlatBufferItem(1)] public float Y { get; set; } + + public override string ToString() => $"{{ X: {X}, Y: {Y} }}"; } diff --git a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedVec3f.cs b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedVec3f.cs index b9e94a39..9bba2e85 100644 --- a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedVec3f.cs +++ b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedVec3f.cs @@ -6,7 +6,9 @@ namespace pkNX.Structures.FlatBuffers; [FlatBufferStruct, TypeConverter(typeof(ExpandableObjectConverter))] public class PackedVec3f { - [FlatBufferItem(00)] public float X { get; set; } = 0; - [FlatBufferItem(01)] public float Y { get; set; } = 0; - [FlatBufferItem(02)] public float Z { get; set; } = 0; + [FlatBufferItem(00)] public float X { get; set; } + [FlatBufferItem(01)] public float Y { get; set; } + [FlatBufferItem(02)] public float Z { get; set; } + + public override string ToString() => $"{{ X: {X}, Y: {Y}, Z: {Z} }}"; } diff --git a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedVec4f.cs b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedVec4f.cs index e4780db1..abc20700 100644 --- a/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedVec4f.cs +++ b/pkNX.Structures.FlatBuffers/Util/Math/Packed/PackedVec4f.cs @@ -11,6 +11,8 @@ public class PackedVec4f [FlatBufferItem(2)] public float Z { get; set; } [FlatBufferItem(3)] public float W { get; set; } + public PackedVec4f() { } + public PackedVec4f(float x = 0, float y = 0, float z = 0, float w = 0) { X = x; @@ -18,4 +20,6 @@ public PackedVec4f(float x = 0, float y = 0, float z = 0, float w = 0) Z = z; W = w; } + + public override string ToString() => $"{{ X: {X}, Y: {Y}, Z: {Z}, W: {W} }}"; } diff --git a/pkNX.Structures.FlatBuffers/Util/Math/Transform.cs b/pkNX.Structures.FlatBuffers/Util/Math/Transform.cs index debf09b4..171f1d66 100644 --- a/pkNX.Structures.FlatBuffers/Util/Math/Transform.cs +++ b/pkNX.Structures.FlatBuffers/Util/Math/Transform.cs @@ -9,4 +9,6 @@ public class Transform [FlatBufferItem(0)] public PackedVec3f Scale { get; set; } = new(); [FlatBufferItem(1)] public PackedVec3f Rotate { get; set; } = new(); [FlatBufferItem(2)] public PackedVec3f Translate { get; set; } = new(); + + public override string ToString() => $"{{ S: {Scale}, R: {Rotate}, T: {Translate} }}"; }