Rework

Author: IntoTheDev

Pool.cs

@@ -1,44 +1,67 @@
-#if ODIN_INSPECTOR
-using Sirenix.OdinInspector;
-#endif
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace ToolBox.Pools
 {
-#if ODIN_INSPECTOR
-	[Required, AssetSelector]
-#endif
-	[CreateAssetMenu(menuName = "ToolBox/Pool")]
-    public sealed class Pool : ScriptableObject
-    {
-#if ODIN_INSPECTOR
-		[Required, ValueDropdown(nameof(GetPoolables))]
-#endif
-		[SerializeField] private Poolable _prefab = null;
-		[SerializeField] private int _startCount = 0;
-
+	public sealed class Pool
+	{
+		private Poolable _prefab = null;
 		private int _currentCount = 0;
 		private Queue<Poolable> _entities = null;
 
-		private void OnValidate()
+		private static Dictionary<int, Pool> _pools = new Dictionary<int, Pool>();
+
+		public Pool(Poolable prefab, int count)
 		{
-			if (_prefab != null)
-				_prefab.SetPool(this);
+			_prefab = prefab;
+			_currentCount = count;
+			_entities = new Queue<Poolable>(count);
+			_pools.Add(prefab.gameObject.GetHashCode(), this);
+
+			Populate(count);
 		}
 
-		public void Fill()
+		/// <summary>
+		/// Prefab must contain Poolable component
+		/// </summary>
+		public Pool(GameObject prefab, int count)
 		{
-			_entities = new Queue<Poolable>(_startCount);
-			_currentCount = _startCount;
+			_prefab = prefab.GetComponent<Poolable>();
 
-			for (int i = 0; i < _startCount; i++)
+			if (_prefab == null)
 			{
-				Poolable entity = Instantiate(_prefab);
+				_prefab = Object.Instantiate(prefab).AddComponent<Poolable>();
+				_prefab.gameObject.SetActive(false);
+			}
+
+			_currentCount = count;
+			_entities = new Queue<Poolable>(count);
+			_pools.Add(prefab.GetHashCode(), this);
+
+			Populate(count);
+		}
+
+		public static Pool Get(GameObject prefab)
+		{
+			var hasPool = _pools.TryGetValue(prefab.GetHashCode(), out var pool);
+
+			if (!hasPool)
+				pool = new Pool(prefab, 0);
+
+			return pool;
+		}
+
+		public void Populate(int count)
+		{
+			for (int i = 0; i < count; i++)
+			{
+				Poolable entity = Object.Instantiate(_prefab);
 				entity.SetPool(this);
 				_entities.Enqueue(entity);
 				entity.gameObject.SetActive(false);
 			}
+
+			_currentCount += count;
 		}
 
 		public Poolable GetEntity()
@@ -111,7 +134,7 @@ private Poolable TakeEntity()
 
 			if (_currentCount == 0)
 			{
-				entity = Instantiate(_prefab);
+				entity = Object.Instantiate(_prefab);
 				entity.SetPool(this);
 
 				return entity;
@@ -121,7 +144,7 @@ private Poolable TakeEntity()
 
 			if (entity == null)
 			{
-				entity = Instantiate(_prefab);
+				entity = Object.Instantiate(_prefab);
 				entity.SetPool(this);
 				_currentCount++;
 			}
@@ -131,8 +154,5 @@ private Poolable TakeEntity()
 
 			return entity;
 		}
-
-		private IEnumerable<Poolable> GetPoolables() =>
-			Resources.FindObjectsOfTypeAll<Poolable>();
 	}
 }

PoolExtensions.cs

@@ -0,0 +1,102 @@
+using UnityEngine;
+
+namespace ToolBox.Pools
+{
+	public static class PoolExtensions
+	{
+		/// <summary>
+		/// Use this method only with Prefabs
+		/// </summary>
+		public static void Populate(this GameObject prefab, int count)
+		{
+			var pool = Pool.Get(prefab);
+			pool.Populate(count);
+		}
+
+		/// <summary>
+		/// Use this method only with Prefabs
+		/// </summary>
+		public static Poolable Spawn(this GameObject prefab)
+		{
+			var pool = Pool.Get(prefab);
+			var entity = pool.GetEntity();
+
+			return entity;
+		}
+
+		/// <summary>
+		/// Use this method only with Prefabs
+		/// </summary>
+		public static Poolable Spawn(this GameObject prefab, Transform parent, bool spawnInWorldSpace)
+		{
+			var pool = Pool.Get(prefab);
+			var entity = pool.GetEntity(parent, spawnInWorldSpace);
+
+			return entity;
+		}
+
+		/// <summary>
+		/// Use this method only with Prefabs
+		/// </summary>
+		public static Poolable Spawn(this GameObject prefab, Vector3 position, Quaternion rotation)
+		{
+			var pool = Pool.Get(prefab);
+			var entity = pool.GetEntity(position, rotation);
+
+			return entity;
+		}
+
+		/// <summary>
+		/// Use this method only with Prefabs
+		/// </summary>
+		public static Poolable Spawn(this GameObject prefab, Vector3 position, Quaternion rotation, Transform parent, bool spawnInWorldSpace)
+		{
+			var pool = Pool.Get(prefab);
+			var entity = pool.GetEntity(position, rotation, parent, spawnInWorldSpace);
+
+			return entity;
+		}
+
+		/// <summary>
+		/// Use this method only with Prefabs
+		/// </summary>
+		public static T Spawn<T>(this GameObject prefab) where T : Component =>
+			prefab.Spawn().GetComponent<T>();
+
+		/// <summary>
+		/// Use this method only with Prefabs
+		/// </summary>
+		public static T Spawn<T>(this GameObject prefab, Transform parent, bool spawnInWorldSpace) where T : Component =>
+			prefab.Spawn(parent, spawnInWorldSpace).GetComponent<T>();
+
+		/// <summary>
+		/// Use this method only with Prefabs
+		/// </summary>
+		public static T Spawn<T>(this GameObject prefab, Vector3 position, Quaternion rotation) where T : Component =>
+			prefab.Spawn(position, rotation).GetComponent<T>();
+
+		/// <summary>
+		/// Use this method only with Prefabs
+		/// </summary>
+		public static T Spawn<T>(this GameObject prefab, Vector3 position, Quaternion rotation, Transform parent, bool spawnInWorldSpace) where T : Component =>
+			prefab.Spawn(position, rotation, parent, spawnInWorldSpace).GetComponent<T>();
+
+		/// <summary>
+		/// Use this method only with Instances of Prefab
+		/// </summary>
+		public static void Despawn(this Poolable instance) =>
+			instance.ReturnToPool();
+
+		/// <summary>
+		/// Use this method only with Instances of Prefab
+		/// </summary>
+		public static void Despawn(this GameObject instance) =>
+			instance.GetComponent<Poolable>().ReturnToPool();
+
+		/// <summary>
+		/// Use this method only with Instances of Prefab
+		/// </summary>
+		public static void Despawn(this Transform instance) =>
+			instance.GetComponent<Poolable>().ReturnToPool();
+	}
+}

PoolExtensions.cs.meta

@@ -0,0 +1,26 @@
+using UnityEngine;
+
+namespace ToolBox.Pools
+{
+	[DefaultExecutionOrder(-9999)]
+	public class PoolInstaller : MonoBehaviour
+	{
+		[SerializeField] private PoolContainer[] _pools = null;
+
+		private void Awake()
+		{
+			for (int i = 0; i < _pools.Length; i++)
+				_pools[i].Populate();
+		}
+
+		[System.Serializable]
+		private struct PoolContainer
+		{
+			[SerializeField] private GameObject _prefab;
+			[SerializeField, Min(1)] private int _startCount;
+
+			public void Populate() =>
+				new Pool(_prefab, _startCount);
+		}
+	}
+}

PoolFiller.cs

@@ -8,21 +8,14 @@ namespace ToolBox.Pools
 	[DisallowMultipleComponent]
 	public class Poolable : MonoBehaviour
 	{
-		[SerializeField] private Pool _pool = null;
-
 		public Pool Pool { get; private set; } = null;
 
 		private IPoolable[] _poolables = null;
 		private bool _isPooled = false;
 		private bool _isEnabled = true;
 
-		private void Awake()
-		{
-			if (_pool != null)
-				SetPool(_pool);
-
+		private void Awake() =>
 			_poolables = GetComponentsInChildren<IPoolable>(true);
-		}
 
 #if ODIN_INSPECTOR
 		[Button]