Use duality serializer for editoruserdata

Source/Core/Duality/DualityApp.cs

@@ -222,15 +222,13 @@ public static SoundDevice Sound
 			get { return sound; }
 		}
 		/// <summary>
-		/// [GET / SET] Provides access to Duality's current <see cref="DualityAppData">application data</see>. This is never null.
+		/// [GET] Provides access to core application / game config, such as physics or backend settings. This is never null.
 		/// </summary>
 		public static SettingsContainer<DualityAppData> AppData { get; } = new SettingsContainer<DualityAppData>("AppData.xml");
-
 		/// <summary>
-		/// [GET / SET] Provides access to Duality's current <see cref="DualityUserData">user data</see>. This is never null.
+		/// [GET] Provides access to game options / user data, such as display resolution or audio volume. This is never null.
 		/// </summary>
 		public static SettingsContainer<DualityUserData> UserData { get; } = new SettingsContainer<DualityUserData>(execContext == ExecutionContext.Editor ? "DefaultUserData.xml" : "UserData.xml");
-
 		/// <summary>
 		/// [GET] Returns the <see cref="ExecutionContext"/> in which this DualityApp is currently running.
 		/// </summary>

Source/Core/Duality/Utility/SettingsContainer.cs

@@ -10,7 +10,7 @@ namespace Duality
 	public class SettingsContainer<TSettings> : ISettingsContainer
 		where TSettings : class, new()
 	{
-		private readonly string path;
+		public string Path { get; }
 
 		/// <summary>
 		/// Fired when <see cref="Instance"/> has changed.
@@ -28,15 +28,15 @@ public class SettingsContainer<TSettings> : ISettingsContainer
 		/// <param name="path"></param>
 		public SettingsContainer(string path)
 		{
-			this.path = path;
+			this.Path = path;
 		}
 
 		/// <summary>
 		/// Loads the data of <typeparamref name="TSettings"/> from file.
 		/// </summary>
 		public void Load()
 		{
-			this.Instance = Serializer.TryReadObject<TSettings>(this.path, typeof(XmlSerializer)) ?? new TSettings();
+			this.Instance = Serializer.TryReadObject<TSettings>(this.Path, typeof(XmlSerializer)) ?? new TSettings();
 			this.Changed?.Invoke(this, EventArgs.Empty);
 		}
 
@@ -45,7 +45,7 @@ public void Load()
 		/// </summary>
 		public void Save()
 		{
-			Serializer.WriteObject(this.Instance, this.path, typeof(XmlSerializer));
+			Serializer.WriteObject(this.Instance, this.Path, typeof(XmlSerializer));
 		}
 	}
 }

Source/Editor/DualityEditor/DesignTimeObjectData.cs

@@ -1,10 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Drawing;
-using System.IO;
 
-using Duality;
 using Duality.Serialization;
 using Duality.Resources;
 
@@ -77,42 +74,20 @@ public bool Equals(DataContainer other)
 			}
 		}
 
-		private	static	DesignTimeObjectDataManager	manager	= new DesignTimeObjectDataManager();
-
 		internal static void Init()
 		{
-			Load(DualityEditorApp.DesignTimeDataFile);
 			Scene.Leaving += Scene_Leaving;
 		}
 		internal static void Terminate()
 		{
 			Scene.Leaving -= Scene_Leaving;
-			Save(DualityEditorApp.DesignTimeDataFile);
 		}
 
-		public static DesignTimeObjectData Get(Guid objId)
-		{
-			return manager.RequestDesignTimeData(objId);
-		}
-		public static DesignTimeObjectData Get(GameObject obj)
-		{
-			return manager.RequestDesignTimeData(obj.Id);
-		}
-
-		private static void Save(string filePath)
-		{
-			Serializer.WriteObject(manager, filePath, typeof(BinarySerializer));
-		}
-		private static void Load(string filePath)
-		{
-			manager = Serializer.TryReadObject<DesignTimeObjectDataManager>(filePath) ?? new DesignTimeObjectDataManager();
-		}
 		private static void Scene_Leaving(object sender, EventArgs e)
 		{
-			manager.CleanupDesignTimeData();
+			DualityEditorApp.UserData.Instance?.PerObjectData.Cleanup();
 		}
 
-
 		public static readonly DesignTimeObjectData Default = new DesignTimeObjectData();
 
 		private	Guid			objId		= Guid.Empty;
@@ -184,6 +159,11 @@ public DesignTimeObjectData(Guid parentId, DesignTimeObjectData baseData)
 			this.attached = true;
 		}
 
+		public static DesignTimeObjectData Get(GameObject obj)
+		{
+			return DualityEditorApp.UserData.Instance.PerObjectData.Request(obj.Id);
+		}
+
 		public T RequestCustomData<T>() where T : new()
 		{
 			this.Detach();
@@ -230,109 +210,4 @@ private void Detach()
 			this.attached = false;
 		}
 	}
-
-	internal class DesignTimeObjectDataManager : ISerializeExplicit
-	{
-		private static readonly int GuidByteLength = Guid.Empty.ToByteArray().Length;
-		private	const int Version_First	= 1;
-
-		private	Dictionary<Guid,DesignTimeObjectData>	dataStore	= new Dictionary<Guid,DesignTimeObjectData>();
-
-
-		public DesignTimeObjectData RequestDesignTimeData(Guid objId)
-		{
-			DesignTimeObjectData data;
-			if (!this.dataStore.TryGetValue(objId, out data))
-			{
-				data = new DesignTimeObjectData(objId, DesignTimeObjectData.Default);
-				this.dataStore[objId] = data;
-			}
-			return data;
-		}
-		public void CleanupDesignTimeData()
-		{
-			// Remove trivial / default data
-			var removeQuery = 
-				from p in this.dataStore
-				where p.Value.IsDefault
-				select p.Value.ParentObjectId;
-			foreach (Guid objId in removeQuery.ToArray())
-				this.dataStore.Remove(objId);
-		}
-		public void OptimizeDesignTimeData()
-		{
-			// Optimize data by sharing
-			var shareValues = this.dataStore.Values.ToList();
-			while (shareValues.Count > 0)
-			{
-				DesignTimeObjectData data = shareValues[shareValues.Count - 1];
-				foreach (DesignTimeObjectData other in shareValues)
-				{
-					data.TryShareData(other);
-				}
-				shareValues.RemoveAt(shareValues.Count - 1);
-			}
-		}
-
-		void ISerializeExplicit.WriteData(IDataWriter writer)
-		{
-			this.CleanupDesignTimeData();
-			this.OptimizeDesignTimeData();
-
-			Guid[] guidArray = dataStore.Keys.ToArray();
-			byte[] data = new byte[guidArray.Length * GuidByteLength];
-			for (int i = 0; i < guidArray.Length; i++)
-			{
-				Array.Copy(
-					guidArray[i].ToByteArray(), 0, 
-					data, i * GuidByteLength, GuidByteLength);
-			}
-			DesignTimeObjectData.DataContainer[] objData = dataStore.Values.Select(d => d.Data).ToArray();
-			bool[] objDataDirty = dataStore.Values.Select(d => d.IsAttached).ToArray();
-
-			writer.WriteValue("version", Version_First);
-			writer.WriteValue("dataStoreKeys", data);
-			writer.WriteValue("dataStoreValues", objData);
-			writer.WriteValue("dataStoreDirtyFlag", objDataDirty);
-		}
-		void ISerializeExplicit.ReadData(IDataReader reader)
-		{
-			int version;
-			reader.ReadValue("version", out version);
-
-			if (this.dataStore == null)
-				this.dataStore = new Dictionary<Guid,DesignTimeObjectData>();
-			else
-				this.dataStore.Clear();
-
-			if (version == Version_First)
-			{
-				byte[] data;
-				DesignTimeObjectData.DataContainer[] objData;
-				bool[] objDataDirty;
-				reader.ReadValue("dataStoreKeys", out data);
-				reader.ReadValue("dataStoreValues", out objData);
-				reader.ReadValue("dataStoreDirtyFlag", out objDataDirty);
-
-				Guid[] guidArray = new Guid[data.Length / GuidByteLength];
-				byte[] guidData = new byte[GuidByteLength];
-				for (int i = 0; i < guidArray.Length; i++)
-				{
-					Array.Copy(
-						data, i * GuidByteLength,
-						guidData, 0, GuidByteLength);
-					guidArray[i] = new Guid(guidData);
-				}
-
-				for (int i = 0; i < objData.Length; i++)
-				{
-					this.dataStore.Add(guidArray[i], new DesignTimeObjectData(guidArray[i], objData[i], objDataDirty[i]));
-				}
-			}
-			else
-			{
-				// Unknown format
-			}
-		}
-	}
 }

Source/Editor/DualityEditor/DesignTimeObjectDataManager.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+using Duality.Serialization;
+using Duality.Resources;
+
+namespace Duality.Editor
+{
+	internal class DesignTimeObjectDataManager : ISerializeExplicit
+	{
+		private static readonly int GuidByteLength = Guid.Empty.ToByteArray().Length;
+		private const int Version_First = 1;
+
+		private	Dictionary<Guid,DesignTimeObjectData>	dataStore	= new Dictionary<Guid,DesignTimeObjectData>();
+
+		public DesignTimeObjectData Request(Guid objId)
+		{
+			DesignTimeObjectData data;
+			if (!this.dataStore.TryGetValue(objId, out data))
+			{
+				data = new DesignTimeObjectData(objId, DesignTimeObjectData.Default);
+				this.dataStore[objId] = data;
+			}
+			return data;
+		}
+		public void Cleanup()
+		{
+			// Remove trivial / default data
+			var removeQuery =
+				from p in this.dataStore
+				where p.Value.IsDefault
+				select p.Value.ParentObjectId;
+			foreach (Guid objId in removeQuery.ToArray())
+				this.dataStore.Remove(objId);
+		}
+		public void Optimize()
+		{
+			// Optimize data by sharing
+			var shareValues = this.dataStore.Values.ToList();
+			while (shareValues.Count > 0)
+			{
+				DesignTimeObjectData data = shareValues[shareValues.Count - 1];
+				foreach (DesignTimeObjectData other in shareValues)
+				{
+					data.TryShareData(other);
+				}
+				shareValues.RemoveAt(shareValues.Count - 1);
+			}
+		}
+
+		void ISerializeExplicit.WriteData(IDataWriter writer)
+		{
+			this.Cleanup();
+			this.Optimize();
+
+			Guid[] guidArray = this.dataStore.Keys.ToArray();
+			byte[] data = new byte[guidArray.Length * GuidByteLength];
+			for (int i = 0; i < guidArray.Length; i++)
+			{
+				Array.Copy(
+					guidArray[i].ToByteArray(), 0,
+					data, i * GuidByteLength, GuidByteLength);
+			}
+			DesignTimeObjectData.DataContainer[] objData = this.dataStore.Values.Select(d => d.Data).ToArray();
+			bool[] objDataDirty = this.dataStore.Values.Select(d => d.IsAttached).ToArray();
+
+			writer.WriteValue("version", Version_First);
+			writer.WriteValue("dataStoreKeys", data);
+			writer.WriteValue("dataStoreValues", objData);
+			writer.WriteValue("dataStoreDirtyFlag", objDataDirty);
+		}
+		void ISerializeExplicit.ReadData(IDataReader reader)
+		{
+			int version;
+			reader.ReadValue("version", out version);
+
+			if (this.dataStore == null)
+				this.dataStore = new Dictionary<Guid, DesignTimeObjectData>();
+			else
+				this.dataStore.Clear();
+
+			if (version == Version_First)
+			{
+				byte[] data;
+				DesignTimeObjectData.DataContainer[] objData;
+				bool[] objDataDirty;
+				reader.ReadValue("dataStoreKeys", out data);
+				reader.ReadValue("dataStoreValues", out objData);
+				reader.ReadValue("dataStoreDirtyFlag", out objDataDirty);
+
+				Guid[] guidArray = new Guid[data.Length / GuidByteLength];
+				byte[] guidData = new byte[GuidByteLength];
+				for (int i = 0; i < guidArray.Length; i++)
+				{
+					Array.Copy(
+						data, i * GuidByteLength,
+						guidData, 0, GuidByteLength);
+					guidArray[i] = new Guid(guidData);
+				}
+
+				for (int i = 0; i < objData.Length; i++)
+				{
+					this.dataStore.Add(guidArray[i], new DesignTimeObjectData(guidArray[i], objData[i], objDataDirty[i]));
+				}
+			}
+			else
+			{
+				// Unknown format
+			}
+		}
+	}
+}