Merge pull request #2 from IntoTheDev/v1.5.0

Big performance improvements

Author: IntoTheDev

Runtime/ILoadable.cs

@@ -1,4 +1,7 @@
 namespace ToolBox.Loader
 {
-	public interface ILoadable { }
+	public interface ILoadable 
+	{
+		void Load();
+	}
 }

Runtime/Resources.meta

@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6b5c09a589fc4a342af3d68e42917775, type: 3}
+  m_Name: ToolBoxStorage
+  m_EditorClassIdentifier: 
+  _assets: []

Runtime/Resources/ToolBoxStorage.asset

@@ -1,37 +1,43 @@
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 #if UNITY_EDITOR
 using ToolBox.Loader.Editor;
+using UnityEditor;
 #endif
 using UnityEngine;
 
 namespace ToolBox.Loader
 {
-	public static class Storage
+	public class Storage : ScriptableObject
 	{
-		private static ScriptableObject[] _assets = null;
+		[SerializeField] private ScriptableObject[] _assets = null;
+
+		private static ILoadable[] _loadables = new ILoadable[0];
 
 		[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
 		private static void Setup()
 		{
 #if UNITY_EDITOR
-			var assets = EditorStorage.GetAllAssetsOfType<ScriptableObject>().ToArray();
+			LoadAssetsInEditor();
 #else
-			var assets = Resources.LoadAll<ScriptableObject>("");
+			_loadables = Resources.Load<Storage>("ToolBoxStorage")._assets.Cast<ILoadable>().ToArray();
 #endif
-			_assets = assets.Where(x => x is ILoadable).ToArray();
+			for (int i = 0; i < _loadables.Length; i++)
+				_loadables[i].Load();
 		}
 
 		public static T Get<T>() where T : ScriptableObject, ILoadable
 		{
 #if UNITY_EDITOR
 			if (!Application.isPlaying)
-				_assets = EditorStorage.GetAllAssetsOfType<ScriptableObject>().ToArray();
+				LoadAssetsInEditor();
 #endif
 
-			for (int i = 0; i < _assets.Length; i++)
-				if (_assets[i] is T asset)
-					return asset;
+			for (int i = 0; i < _loadables.Length; i++)
+				if (_loadables[i] is T loadable)
+					return loadable;
 
 			return null;
 		}
@@ -40,10 +46,37 @@ public static IEnumerable<T> GetAll<T>() where T : ScriptableObject, ILoadable
 		{
 #if UNITY_EDITOR
 			if (!Application.isPlaying)
-				_assets = EditorStorage.GetAllAssetsOfType<ScriptableObject>().ToArray();
+				LoadAssetsInEditor();
 #endif
 
-			return _assets.Where(a => a is T).Cast<T>();
+			return _loadables.Where(a => a is T).Cast<T>();
+		}
+
+#if UNITY_EDITOR
+		private static void LoadAssetsInEditor()
+		{
+			_loadables = EditorStorage.
+				GetAllAssetsOfType<ScriptableObject>().
+				Where(x => x is ILoadable).
+				Cast<ILoadable>().
+				ToArray();
+		}
+
+		internal void LoadAssets()
+		{
+			// I don't know why but if you haven't selected this asset, array will be empty in build and after
+			Selection.activeObject = this;
+
+			var assets = EditorStorage.GetAllAssetsOfType<ScriptableObject>();
+			var loadables = assets.Where(x => x is ILoadable).ToArray();
+			var initializables = assets.Where(x => x is IInitializableBeforeBuild).Cast<IInitializableBeforeBuild>();
+
+			_assets = new ScriptableObject[loadables.Length];
+			Array.Copy(loadables, _assets, loadables.Length);
+
+			foreach (var initializable in initializables)
+				initializable.Init();
 		}
+#endif
 	}
 }

Runtime/Resources/ToolBoxStorage.asset.meta

@@ -1,54 +1,16 @@
-#if UNITY_EDITOR
-using System.Linq;
-using UnityEditor;
+#if UNITY_EDITOR
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
 
 namespace ToolBox.Loader.Editor
 {
-	public class StorageBuildProcessor : IPreprocessBuildWithReport, IPostprocessBuildWithReport
+	public class StorageBuildProcessor : IPreprocessBuildWithReport
 	{
-		private ScriptableObject[] _loadables = null;
-
 		public int callbackOrder => 0;
 
-		public void OnPreprocessBuild(BuildReport report)
-		{
-			if (!AssetDatabase.IsValidFolder("Assets/Resources"))
-				AssetDatabase.CreateFolder("Assets", "Resources");
-
-			var assets = EditorStorage.GetAllAssetsOfType<ScriptableObject>();
-			var loadables = assets.Where(x => x is ILoadable).ToArray();
-			var initializables = assets.Where(x => x is IInitializableBeforeBuild).Cast<IInitializableBeforeBuild>();
-
-			foreach (var initializable in initializables)
-				initializable.Init();
-
-			_loadables = new ScriptableObject[loadables.Length];
-
-			for (int i = 0; i < loadables.Length; i++)
-			{
-				var loadable = loadables[i];
-				var copy = Object.Instantiate(loadable);
-				string path = $"Assets/Resources/{loadable.name}.asset";
-
-				AssetDatabase.CreateAsset(copy, path);
-				_loadables[i] = copy;
-			}
-
-			AssetDatabase.SaveAssets();
-			AssetDatabase.Refresh();
-		}
-
-		public void OnPostprocessBuild(BuildReport report)
-		{
-			foreach (var loadable in _loadables)
-				Object.DestroyImmediate(loadable, true);
-
-			AssetDatabase.SaveAssets();
-			AssetDatabase.Refresh();
-		}
+		public void OnPreprocessBuild(BuildReport report) =>
+			Resources.Load<Storage>("ToolBoxStorage").LoadAssets();
 	}
 }
-#endif
+#endif