string -> ushort

Author: IntoTheDev

Runtime/AssetFormatter.cs

@@ -8,14 +8,14 @@ public class AssetFormatter<T> : IMessagePackFormatter<T> where T : Object
     {
         public void Serialize(ref MessagePackWriter writer, T value, MessagePackSerializerOptions options)
         {
-            DataSerializer.Container.TryResolveId(value, out var id);
+            DataSerializer.Container.TryGetId(value, out var id);
 
-            writer.Write(id);
+            writer.WriteUInt16(id);
         }
 
         public T Deserialize(ref MessagePackReader reader, MessagePackSerializerOptions options)
         {
-            DataSerializer.Container.TryResolveReference(reader.ReadString(), out var value);
+            DataSerializer.Container.TryGetObject(reader.ReadUInt16(), out var value);
 
             return (T)value;
         }

Runtime/AssetsContainer.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 #if UNITY_EDITOR
@@ -9,132 +8,109 @@
 
 namespace ToolBox.Serialization
 {
-	internal sealed class AssetsContainer : ScriptableObject
-	{
-		[SerializeField] private AssetEntry[] _savedAssets;
-		[SerializeField] private string[] _paths;
-
-		public bool TryResolveId(Object value, out string id)
-		{
-			id = null;
-
-			if (!TryGetByObject(value, out var entry))
-			{
-				return false;
-			}
-
-			id = entry.Guid;
-			return true;
-		}
-
-		public bool TryResolveReference(string id, out Object value)
-		{
-			value = null;
-			
-			if (!TryGetById(id, out var entry))
-			{
-				return false;
-			}
-
-			value = entry.Asset;
-			return true;
-		}
+    public sealed class AssetsContainer : ScriptableObject
+    {
+        [SerializeField] private Object[] _savedAssets;
+        [SerializeField] private string[] _paths;
+
+        public bool TryGetObject(ushort id, out Object entry)
+        {
+            entry = null;
+
+            if (id == 0 || id >= _savedAssets.Length)
+            {
+                return false;
+            }
+
+            entry = _savedAssets[id];
+            return true;
+        }
+
+        public bool TryGetId(Object value, out ushort id)
+        {
+            id = 0;
+
+            for (ushort i = 1; i < _savedAssets.Length; i++)
+            {
+                if (_savedAssets[i] != value)
+                {
+                    continue;
+                }
+
+                id = i;
+                return true;
+            }
+
+            return false;
+        }
 
 #if UNITY_EDITOR
-		public void LoadAssets()
-		{
-			if (_paths == null)
-			{
-				return;
-			}
-
-			_paths = _paths.Where(x => !string.IsNullOrEmpty(x) && AssetDatabase.IsValidFolder(x)).ToArray();
-
-			if (_paths.Length == 0)
-			{
-				return;
-			}
-			
-			// ReSharper disable once UseArrayEmptyMethod
-			_savedAssets ??= new AssetEntry[0];
-
-			var assets = AssetDatabase
-				.FindAssets("t:Object", _paths)
-				.Select(AssetDatabase.GUIDToAssetPath)
-				.Select(AssetDatabase.LoadAssetAtPath<Object>)
-				.Where(x =>
-				{
-					var fileNamespace = x.GetType().Namespace;
-
-					return x != null && (fileNamespace == null || !fileNamespace.Contains("UnityEditor"));
-				})
-				.ToList();
-
-			var newEntries = new List<AssetEntry>();
-
-			foreach (var asset in assets)
-			{
-				if (!TryGetByObject(asset, out _))
-				{
-					newEntries.Add(new AssetEntry(Guid.NewGuid().ToString(), asset));
-				}
-
-				var children = AssetDatabase.LoadAllAssetRepresentationsAtPath(AssetDatabase.GetAssetPath(asset));
-
-				foreach (var child in children)
-				{
-					if (TryGetByObject(child, out _))
-					{
-						continue;
-					}
-					
-					newEntries.Add(new AssetEntry(Guid.NewGuid().ToString(), child));
-				}
-			}
-
-			ArrayUtility.AddRange(ref _savedAssets, newEntries.ToArray());
-			EditorUtility.SetDirty(this);
-		}
-		
-		public void Clear()
-		{
-			_savedAssets = null;
-			EditorUtility.SetDirty(this);
-		}
+        public void LoadAssets()
+        {
+            if (_paths == null)
+            {
+                return;
+            }
+
+            _paths = _paths.Where(x => !string.IsNullOrEmpty(x) && AssetDatabase.IsValidFolder(x)).ToArray();
+
+            if (_paths.Length == 0)
+            {
+                return;
+            }
+
+            // ReSharper disable once UseArrayEmptyMethod
+            _savedAssets ??= new Object[0];
+
+            var assets = AssetDatabase
+                .FindAssets("t:Object", _paths)
+                .Select(AssetDatabase.GUIDToAssetPath)
+                .Select(AssetDatabase.LoadAssetAtPath<Object>)
+                .Where(x =>
+                {
+                    var fileNamespace = x.GetType().Namespace;
+
+                    return x != null && (fileNamespace == null || !fileNamespace.Contains("UnityEditor"));
+                })
+                .ToList();
+
+            var newEntries = new List<Object>();
+
+            foreach (var asset in assets)
+            {
+                if (!TryGetId(asset, out _))
+                {
+                    newEntries.Add(asset);
+                }
+
+                var children = AssetDatabase.LoadAllAssetRepresentationsAtPath(AssetDatabase.GetAssetPath(asset));
+
+                foreach (var child in children)
+                {
+                    if (TryGetId(child, out _))
+                    {
+                        continue;
+                    }
+
+                    newEntries.Add(child);
+                }
+            }
+
+            ArrayUtility.AddRange(ref _savedAssets, newEntries.ToArray());
+
+            if (_savedAssets.Length == 0 || _savedAssets[0] != null)
+            {
+                ArrayUtility.Insert(ref _savedAssets, 0, null);
+            }
+
+            EditorUtility.SetDirty(this);
+        }
+
+        public void Clear()
+        {
+            _savedAssets = null;
+            EditorUtility.SetDirty(this);
+        }
 #endif
-
-		private bool TryGetById(string guid, out AssetEntry entry)
-		{
-			foreach (var asset in _savedAssets)
-			{
-				if (asset.Guid != guid)
-				{
-					continue;
-				}
-
-				entry = asset;
-				return true;
-			}
-
-			entry = null;
-			return false;
-		}
-
-		private bool TryGetByObject(Object value, out AssetEntry entry)
-		{
-			foreach (var asset in _savedAssets)
-			{
-				if (asset.Asset != value)
-				{
-					continue;
-				}
-
-				entry = asset;
-				return true;
-			}
-
-			entry = null;
-			return false;
-		}
-	}
-}
+    }
+}