Create non-generic CDmePolygonMeshDataStream for deserializer

Author: kristiker

AttributeList.cs

@@ -272,7 +272,9 @@ public virtual object? this[string name]
                         if(value != null)
                         {
                             var valueType = value.GetType();
-                            if (prop.PropertyType != valueType)
+
+                            // type must be equal, or a superclass
+                            if (prop.PropertyType != valueType && valueType.IsSubclassOf(prop.PropertyType))
                             {
                                 throw new InvalidDataException($"class property '{prop.Name}' with type '{prop.PropertyType}' does not match the type '{valueType}' of the value being set, this is likely a mismatch between the real class and the class from the datamodel");
                             }

Tests/Tests.cs

@@ -10,7 +10,6 @@
 using DM = Datamodel.Datamodel;
 using System.Globalization;
 using VMAP;
-using Vector3Data = VMAP.CDmePolygonMeshDataStream<System.Numerics.Vector3>;
 
 namespace Datamodel_Tests
 {
@@ -322,8 +321,11 @@ private static void Validate_Vmap_Reflection(Datamodel.Datamodel unserialisedVma
             Assert.AreEqual(vertexData.size, 8);
             Assert.AreEqual(vertexData.streams[0]["semanticName"], "position");
 
-            // todo: vertexData.streams[0] is not a instance of CDmePolygonMeshDataStream<Vector3>
-            // Assert.AreEqual(((Vector3Data)vertexData.streams[0]).semanticName, "position");
+            var typedPolygonMeshData = (VMAP.CDmePolygonMeshDataStream)vertexData.streams[0];
+            Assert.AreEqual(typedPolygonMeshData.semanticName, "position");
+
+            var typedPolygonMeshDataStream = typedPolygonMeshData.data as Vector3Array;
+            Assert.IsNotNull(typedPolygonMeshDataStream);
 
             Assert.That(unserialisedVmap.PrefixAttributes["map_asset_references"], Is.Not.Empty);
 

Tests/ValveMap.cs

@@ -359,8 +359,7 @@ internal class CDmePolygonMeshSubdivisionData : DMElement
     public Datamodel.ElementArray streams { get; set; } = [];
 }
 
-
-internal class CDmePolygonMeshDataStream<T> : DMElement
+internal class CDmePolygonMeshDataStream : DMElement
 {
     public string standardAttributeName { get; set; } = string.Empty;
     public string semanticName { get; set; } = string.Empty;
@@ -371,5 +370,14 @@ internal class CDmePolygonMeshDataStream<T> : DMElement
     /// <summary>
     /// An int, vector2, vector3, or vector4 array.
     /// </summary>
-    public required Datamodel.Array<T> data { get; set; }
+    public System.Collections.IList? data { get; set; }
+}
+
+/// <remarks>
+/// Note: The deserializer does not support generic types, but the serializer does.
+/// </remarks>
+/// <typeparam name="T">Int, Vector2, Vector3, or Vector4</typeparam>
+internal class CDmePolygonMeshDataStream<T> : CDmePolygonMeshDataStream
+{
+    public new required Datamodel.Array<T> data { get; set; }
 }