Support QAngle in KeyValues2

Author: kristiker

Codecs/Binary.cs

@@ -26,8 +26,11 @@ class Binary : IDeferredAttributeCodec, IDisposable
 
         static Binary()
         {
-            SupportedAttributes[1] = SupportedAttributes[2] = new Type[] { typeof(Element), typeof(int), typeof(float), typeof(bool), typeof(string), typeof(byte[]), null /* ObjectID */, typeof(System.Drawing.Color), typeof(Vector2), typeof(Vector3), typeof(Vector4), typeof(Vector3) /* angle*/, typeof(Quaternion), typeof(Matrix4x4) };
-            SupportedAttributes[3] = SupportedAttributes[4] = SupportedAttributes[5] = new Type[] { typeof(Element), typeof(int), typeof(float), typeof(bool), typeof(string), typeof(byte[]), typeof(TimeSpan), typeof(System.Drawing.Color), typeof(Vector2), typeof(Vector3), typeof(Vector4), typeof(Vector3) /* angle*/, typeof(Quaternion), typeof(Matrix4x4) };
+            SupportedAttributes[1] =
+            SupportedAttributes[2] = new Type[] { typeof(Element), typeof(int), typeof(float), typeof(bool), typeof(string), typeof(byte[]), null /* ObjectID */, typeof(System.Drawing.Color), typeof(Vector2), typeof(Vector3), typeof(Vector4), typeof(Vector3) /* angle*/, typeof(Quaternion), typeof(Matrix4x4) };
+            SupportedAttributes[3] =
+            SupportedAttributes[4] =
+            SupportedAttributes[5] = new Type[] { typeof(Element), typeof(int), typeof(float), typeof(bool), typeof(string), typeof(byte[]), typeof(TimeSpan), typeof(System.Drawing.Color), typeof(Vector2), typeof(Vector3), typeof(Vector4), typeof(Vector3) /* angle*/, typeof(Quaternion), typeof(Matrix4x4) };
             SupportedAttributes[9] = new Type[] { typeof(Element), typeof(int), typeof(float), typeof(bool), typeof(string), typeof(byte[]), typeof(TimeSpan), typeof(System.Drawing.Color), typeof(Vector2), typeof(Vector3), typeof(Vector4), typeof(Vector3) /* angle*/, typeof(Quaternion), typeof(Matrix4x4), typeof(UInt64), typeof(byte) };
         }
 

Codecs/KeyValues2.cs

@@ -39,6 +39,7 @@ static KeyValues2()
 
             TypeNames[typeof(byte)] = "uint8";
             TypeNames[typeof(ulong)] = "uint64";
+            TypeNames[typeof(QAngle)] = "qangle";
 
             ValidAttributes[4] = TypeNames.Select(kv => kv.Key).ToArray();
         }
@@ -244,8 +245,8 @@ void WriteAttribute(string name, Type type, object value, bool in_array)
                     var c = (System.Drawing.Color)value;
                     value = String.Join(" ", new int[] { c.R, c.G, c.B, c.A });
                 }
-                else if (type == typeof(UInt64))
-                    value = ((UInt64)value).ToString("X");
+                else if (value is ulong ulong_value)
+                    value = $"0x{ulong_value:X}";
                 else if (type == typeof(Vector2))
                 {
                     var arr = new float[2];
@@ -276,6 +277,10 @@ void WriteAttribute(string name, Type type, object value, bool in_array)
                     var m = (Matrix4x4)value;
                     value = string.Join(" ", m.M11, m.M12, m.M13, m.M14, m.M21, m.M22, m.M23, m.M24, m.M31, m.M32, m.M33, m.M34, m.M41, m.M42, m.M43, m.M44);
                 }
+                else if (value is QAngle qangle_value)
+                {
+                    value = string.Join(" ", (int)qangle_value.Pitch, (int)qangle_value.Yaw, (int)qangle_value.Roll);
+                }
 
                 if (in_array)
                     Writer.Write(String.Format(" \"{0}\",", value.ToString()));
@@ -327,6 +332,7 @@ public void Encode(Datamodel dm, int encoding_version, Stream stream)
                 Writer.WriteTokens("$prefix_element$");
                 Writer.WriteLine("{");
                 Writer.Indent++;
+                Writer.WriteTokenLine("id", "elementid", Guid.NewGuid().ToString());
                 foreach (var attr in dm.PrefixAttributes)
                     WriteAttribute(attr.Key, attr.Value.GetType(), attr.Value, false);
                 Writer.Indent--;

Datamodel.cs

@@ -52,7 +52,8 @@ public DebugView(Datamodel dm)
             typeof(Quaternion),
             typeof(Matrix4x4),
             typeof(byte),
-            typeof(ulong)
+            typeof(ulong),
+            typeof(QAngle),
         };
 
         public static Type[] AttributeTypes => attributeTypes;

Types/QAngle.cs

@@ -0,0 +1,20 @@
+using System.Numerics;
+
+namespace Datamodel;
+
+public struct QAngle
+{
+    public float Pitch;
+    public float Yaw;
+    public float Roll;
+
+    public QAngle(float pitch, float yaw, float roll)
+    {
+        Pitch = pitch;
+        Yaw = yaw;
+        Roll = roll;
+    }
+
+    public static implicit operator Vector3(QAngle q) => new(q.Pitch, q.Yaw, q.Roll);
+    public static implicit operator QAngle(Vector3 v) => new(v.X, v.Y, v.Z);
+}