BREAKING CHANGE: replaced universe objects with root universe object
This commit is contained in:
		@@ -22,7 +22,7 @@ public class UniverseConverter : EngineTypeYamlSerializerBase<IUniverse>
 | 
			
		||||
 | 
			
		||||
        IUniverse universe;
 | 
			
		||||
        IStateEnable stateEnable;
 | 
			
		||||
        List<IUniverseObject> universeObjects;
 | 
			
		||||
        IUniverseObject rootUniverseObject;
 | 
			
		||||
 | 
			
		||||
        parser.Consume<MappingStart>();
 | 
			
		||||
 | 
			
		||||
@@ -34,16 +34,16 @@ public class UniverseConverter : EngineTypeYamlSerializerBase<IUniverse>
 | 
			
		||||
            throw new();
 | 
			
		||||
        SerializedClass instanceSerializedClass = (SerializedClass)rootDeserializer(typeof(SerializedClass))!;
 | 
			
		||||
        ProgressionTracker.Set(isTrackingController ? .2f : ProgressionTracker.Progression, $"Creating {instanceSerializedClass.Type}");
 | 
			
		||||
        universe = (IUniverse)instanceSerializedClass.CreateInstance(EntityRegistry);
 | 
			
		||||
        universe = (IUniverse)instanceSerializedClass.CreateInstance(IdentifiableRegistry);
 | 
			
		||||
 | 
			
		||||
        if (parser.Consume<Scalar>().Value.CompareTo(nameof(IUniverse.StateEnable)) != 0)
 | 
			
		||||
            throw new();
 | 
			
		||||
        stateEnable = (IStateEnable)rootDeserializer(typeof(IStateEnable))!;
 | 
			
		||||
 | 
			
		||||
        ProgressionTracker.Set(isTrackingController ? .5f : ProgressionTracker.Progression, $"Reading universe objects");
 | 
			
		||||
        if (parser.Consume<Scalar>().Value.CompareTo(nameof(IUniverse.UniverseObjects)) != 0)
 | 
			
		||||
        if (parser.Consume<Scalar>().Value.CompareTo(nameof(IUniverse.Root)) != 0)
 | 
			
		||||
            throw new();
 | 
			
		||||
        universeObjects = (List<IUniverseObject>)rootDeserializer(typeof(List<IUniverseObject>))!;
 | 
			
		||||
        rootUniverseObject = (IUniverseObject)rootDeserializer(typeof(IUniverseObject))!;
 | 
			
		||||
 | 
			
		||||
        parser.Consume<MappingEnd>();
 | 
			
		||||
 | 
			
		||||
@@ -52,13 +52,12 @@ public class UniverseConverter : EngineTypeYamlSerializerBase<IUniverse>
 | 
			
		||||
        stateEnable.Assign(universe);
 | 
			
		||||
        universe.Assign(stateEnable);
 | 
			
		||||
 | 
			
		||||
        ProgressionTracker.Set(isTrackingController ? .9f : ProgressionTracker.Progression, "Registering universe objects");
 | 
			
		||||
        for (int i = 0; i < universeObjects.Count; i++)
 | 
			
		||||
        ProgressionTracker.Set(isTrackingController ? .9f : ProgressionTracker.Progression, "Registering root universe object");
 | 
			
		||||
        for (int i = 0; i < rootUniverseObject.Children.Count; i++)
 | 
			
		||||
        {
 | 
			
		||||
            IUniverseObject uo = universeObjects[i];
 | 
			
		||||
            ProgressionTracker.Set(isTrackingController ? .9f + .1f * ((float)i / universeObjects.Count) : ProgressionTracker.Progression, $"Registering {uo.Name}");
 | 
			
		||||
 | 
			
		||||
            universe.Register(uo);
 | 
			
		||||
            IUniverseObject uo = rootUniverseObject.Children[i];
 | 
			
		||||
            ProgressionTracker.Set(isTrackingController ? .9f + .1f * ((float)i / rootUniverseObject.Children.Count) : ProgressionTracker.Progression, $"Registering {uo.Name}");
 | 
			
		||||
            universe.Root.AddChild(uo);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        ProgressionTracker.Set(isTrackingController ? 1f : ProgressionTracker.Progression, $"Created {instanceSerializedClass.Type}");
 | 
			
		||||
@@ -72,7 +71,7 @@ public class UniverseConverter : EngineTypeYamlSerializerBase<IUniverse>
 | 
			
		||||
        bool isTrackingController = ProgressionTracker.Progression.ApproximatelyEquals(0f);
 | 
			
		||||
        ProgressionTracker.Set(isTrackingController ? .25f : ProgressionTracker.Progression, $"Serializing universe");
 | 
			
		||||
 | 
			
		||||
        IEnumerable<IUniverseObject> rootUniverseObjects = universe.UniverseObjects.Where(uo => uo.Parent is null);
 | 
			
		||||
        IUniverseObject rootUniverseObject = universe.Root;
 | 
			
		||||
 | 
			
		||||
        emitter.Emit(new MappingStart());
 | 
			
		||||
 | 
			
		||||
@@ -85,8 +84,8 @@ public class UniverseConverter : EngineTypeYamlSerializerBase<IUniverse>
 | 
			
		||||
        emitter.Emit(new Scalar(nameof(IUniverse.StateEnable)));
 | 
			
		||||
        serializer(universe.StateEnable);
 | 
			
		||||
 | 
			
		||||
        emitter.Emit(new Scalar(nameof(IUniverse.UniverseObjects)));
 | 
			
		||||
        serializer(rootUniverseObjects);
 | 
			
		||||
        emitter.Emit(new Scalar(nameof(IUniverse.Root)));
 | 
			
		||||
        serializer(rootUniverseObject);
 | 
			
		||||
 | 
			
		||||
        ProgressionTracker.Set(isTrackingController ? 1f : ProgressionTracker.Progression, $"Serialized universe");
 | 
			
		||||
        emitter.Emit(new MappingEnd());
 | 
			
		||||
 
 | 
			
		||||
@@ -97,7 +97,7 @@ public class UniverseObjectSerializer : EngineTypeYamlSerializerBase<IUniverseOb
 | 
			
		||||
        serializer(universeObject.BehaviourController);
 | 
			
		||||
 | 
			
		||||
        emitter.Emit(new Scalar(nameof(IUniverseObject.Children)));
 | 
			
		||||
        serializer(universeObject.Children.Where(c => !c.GetType().HasAttribute<IgnoreSerializationAttribute>()));
 | 
			
		||||
        serializer(universeObject.Children.Where(c => !c.GetType().HasAttribute<IgnoreSerializationAttribute>()).Reverse());
 | 
			
		||||
 | 
			
		||||
        ProgressionTracker.Set(isTrackingController ? 1f : ProgressionTracker.Progression, $"Serializing universe object");
 | 
			
		||||
        emitter.Emit(new MappingEnd());
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user