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

Refactored script instance serialization and now the refactoring is finally finished...

Browse Source
This commit is contained in:
Simon Lübeß
2024-04-10 14:42:07 +02:00
parent 95262d67d7
commit d81471419d
5 changed files with 127 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/World/Scene.bf
+6 -5
View File
@@ -958,8 +958,9 @@ namespace GlitchyEngine.World
*/
public Entity CreateInstance(Entity entity)
{
Dictionary<UUID, SerializedObject> serializedData = scope .();
defer { ClearDictionaryAndDeleteValues!(serializedData); }
//Dictionary<UUID, SerializedObject> serializedData = scope .();
ScriptInstanceSerializer scriptSerializer = scope .();
//defer { ClearDictionaryAndDeleteValues!(serializedData); }
List<Entity> newEntities = scope .();
Dictionary<EcsEntity, EcsEntity> sourceToTargetEntity = scope .();
@@ -1002,7 +1003,7 @@ namespace GlitchyEngine.World
if (sourceScript.Instance != null)
{
ScriptEngine.SerializeScriptInstance(sourceScript.Instance, serializedData);
scriptSerializer.SerializeScriptInstance(sourceScript.Instance);
// Initializes the created instance
// TODO: this returns false, if no script with ScriptClassName exists, we have to handle this case correctly I think.
@@ -1024,13 +1025,13 @@ namespace GlitchyEngine.World
Entity newEntity = CopyEntityAndChildren(entity, null);
// Replace old IDs with new ones
ScriptEngine.FixupSerializedIds(sourceIdToTargetId, serializedData);
scriptSerializer.FixupSerializedIds(sourceIdToTargetId);
// Use separate loops for deserialization and OnCreate to ensure complete entities and references in OnCreate
for (let (originalId, newScriptInstance) in newScripts)
{
ScriptEngine.DeserializeScriptInstance(originalId, newScriptInstance, serializedData);
scriptSerializer.DeserializeScriptInstance(originalId, newScriptInstance);
}
for (let (_, newScriptInstance) in newScripts)