Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 13:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Simon Lübeß
2025-03-01 00:48:31 +01:00
parent b5088329f5
commit 10e8b3c282
6 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ScriptCore/Serialization/DeserializationObject.cs
+23 -15
View File
@@ -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
{