Simplified serialization/deserialization of EngineObjects + added support for Assets (actually any EngineObject!)

ScriptCore/Serialization/DeserializationObject.cs

@@ -139,17 +139,17 @@ public class DeserializationObject
         _structScopeName = _structScopeName.Remove(_structScopeName.Length - scopeToRemove.Length - 1);
     }
 
+    [StructLayout(LayoutKind.Sequential)]
+    public unsafe struct EngineObjectReferenceHelper
+    {
+        public byte* FullTypeName;
+        public long FullTypeNameLength;
+        public UUID Id;
+    }
+
     [StructLayout(LayoutKind.Explicit)]
-    private unsafe struct DataHelper
+    private struct DataHelper
     {
-        [StructLayout(LayoutKind.Sequential)]
-        public struct EngineObjectReferenceHelper
-        {
-            public byte* FullTypeName;
-            public long FullTypeNameLength;
-            public UUID Id;
-        }
-        
         [FieldOffset(0)]
         public EngineObjectReferenceHelper EngineObjectReference;
 
@@ -220,8 +220,7 @@ public class DeserializationObject
             SerializationType.Double => *(double*)rawData,
             SerializationType.Decimal => *(decimal*)rawData,
             SerializationType.Enum => GetString(),
-            SerializationType.EntityReference => dataHelper.EngineObjectReference,
-            SerializationType.ComponentReference => dataHelper.EngineObjectReference,
+            SerializationType.EngineObjectReference => dataHelper.EngineObjectReference,
             SerializationType.ObjectReference => dataHelper.UUID,
             _ => NoValueDeserialized
         };
@@ -549,12 +548,13 @@ public class DeserializationObject
 
         bool isEntity = typeof(Entity).IsAssignableFrom(fieldType);
         bool isComponent = fieldType.IsSubclassOf(typeof(Component));
+        bool isEngineObject = fieldType.IsSubclassOf(typeof(EngineObject));
 
-        if (isEntity || isComponent)
+        if (isEntity || isComponent || isEngineObject)
         {
-            object? fieldData = GetFieldValue(fieldName, isEntity ? SerializationType.EntityReference : SerializationType.ComponentReference);
+            object? fieldData = GetFieldValue(fieldName, SerializationType.EngineObjectReference);
 
-            if (fieldData is not DataHelper.EngineObjectReferenceHelper data)
+            if (fieldData is not EngineObjectReferenceHelper data)
                 return NoValueDeserialized;
 
             UUID id = data.Id;
@@ -578,12 +578,20 @@ public class DeserializationObject
 
                 return Entity.GetScriptReference(id, type);
             }
-            else
+            if (isComponent)
             {
                 Entity entity = new Entity(id);
 
                 return entity.GetComponent(type);
             }
+            if (isEngineObject)
+            {
+                EngineObject? engineObject = ActivatorExtension.CreateEngineObject(type, id);
+
+                return engineObject;
+            }
+
+            return NoValueDeserialized;
         }
         else
         {

ScriptCore/Serialization/SerializationType.cs

@@ -35,10 +35,10 @@ public enum SerializationType : uint
 
     Enum = 1 << 26,
 
-    EntityReference = 1 << 25,
-    ComponentReference = 1 << 24,
+    // Used for everything that inherits from EngineObject (Assets, Components, Entities)
+    EngineObjectReference = 1 << 25,
 
-    ObjectReference = 1 << 23,
+    ObjectReference = 1 << 24,
 }
 
 public static class SerializationTypeExtension
@@ -69,8 +69,7 @@ public static class SerializationTypeExtension
             SerializationType.Double => typeof(double),
             SerializationType.Decimal => typeof(decimal),
             SerializationType.Enum => typeof(Enum),
-            SerializationType.EntityReference => typeof(UUID),
-            SerializationType.ComponentReference => typeof(UUID),
+            SerializationType.EngineObjectReference => typeof(UUID),
             SerializationType.ObjectReference => typeof(UUID),
             _ => null
         };

ScriptCore/Serialization/SerializedObject.cs

@@ -316,13 +316,9 @@ public class SerializedObject
 
     public void SerializeClass(string fieldName, object? fieldValue, Type fieldType)
     {
-        if (typeof(Entity).IsAssignableFrom(fieldType))
+        if (fieldType.IsSubclassOf(typeof(EngineObject)))
         {
-            AddField(fieldName, SerializationType.EntityReference, ((Entity?)fieldValue)?.UUID ?? UUID.Zero, fieldValue?.GetType().FullName);
-        }
-        else if (fieldType.IsSubclassOf(typeof(Component)))
-        {
-            AddField(fieldName, SerializationType.ComponentReference, ((Component?)fieldValue)?.UUID ?? UUID.Zero, fieldValue?.GetType().FullName);
+            AddField(fieldName, SerializationType.EngineObjectReference, ((EngineObject?)fieldValue)?.UUID ?? UUID.Zero, fieldValue?.GetType().FullName);
         }
         else
         {