Code improvements

Author: IntoTheDev

Runtime/Pool.cs

@@ -8,8 +8,8 @@ public sealed class Pool
 		private Poolable _prefab = null;
 		private Stack<Poolable> _instances = null;
 
-		private static Dictionary<int, Pool> _prefabLookup = new Dictionary<int, Pool>();
-		private static Dictionary<int, Pool> _instanceLookup = new Dictionary<int, Pool>();
+		private static Dictionary<GameObject, Pool> _prefabLookup = new Dictionary<GameObject, Pool>();
+		private static Dictionary<GameObject, Pool> _instanceLookup = new Dictionary<GameObject, Pool>();
 
 		public Pool(GameObject prefab)
 		{
@@ -23,41 +23,33 @@ public Pool(GameObject prefab)
 			}
 
 			_instances = new Stack<Poolable>();
-			_prefabLookup.Add(prefab.GetHashCode(), this);
+			_prefabLookup.Add(prefab, this);
 		}
 
 		public static Pool GetPrefabPool(GameObject prefab)
 		{
-			bool hasPool = _prefabLookup.TryGetValue(prefab.GetHashCode(), out var pool);
+			bool hasPool = _prefabLookup.TryGetValue(prefab, out var pool);
 
 			if (!hasPool)
 				pool = new Pool(prefab);
 
 			return pool;
 		}
 
-		public static Pool GetInstancePool(GameObject instance)
-		{
-			_instanceLookup.TryGetValue(instance.GetHashCode(), out var pool);
-			return pool;
-		}
+		public static bool TryGetInstancePool(GameObject instance, out Pool pool) =>
+			_instanceLookup.TryGetValue(instance, out pool);
 
 		public void Populate(int count)
 		{
 			for (int i = 0; i < count; i++)
 			{
 				var instance = CreateInstance();
 				_instances.Push(instance);
-				instance.gameObject.SetActive(false);
 			}
 		}
 
-		public GameObject Get()
-		{
-			var instance = GetInstance();
-
-			return instance.gameObject;
-		}
+		public GameObject Get() =>
+			GetInstance().gameObject;
 
 		public GameObject Get(Transform parent, bool spawnInWorldSpace)
 		{
@@ -100,45 +92,44 @@ public T Get<T>(Vector3 position, Quaternion rotation) where T : Component =>
 		public T Get<T>(Vector3 position, Quaternion rotation, Transform parent, bool spawnInWorldSpace) where T : Component =>
 			Get(position, rotation, parent, spawnInWorldSpace).GetComponent<T>();
 
-		public void Release(Poolable instance)
+		public void Release(GameObject instance)
 		{
-			_instances.Push(instance);
+			var poolable = instance.GetComponent<Poolable>();
+			_instances.Push(poolable);
 
 			instance.transform.SetParent(null, false);
-			instance.gameObject.SetActive(false);
-			instance.OnRelease();
+			instance.SetActive(false);
+			poolable.OnRelease();
 		}
 
 		private Poolable GetInstance()
 		{
+			Poolable instance;
+
 			if (_instances.Count == 0)
 			{
-				var instance = CreateInstance();
-				instance.gameObject.SetActive(true);
-
-				return instance;
+				instance = CreateInstance();
 			}
 			else
 			{
-				var instance = _instances.Pop();
+				instance = _instances.Pop();
 
 				if (instance == null)
 					instance = CreateInstance();
 				else
 					instance.OnGet();
-
-				instance.gameObject.SetActive(true);
-
-				return instance;
 			}
+
+			instance.gameObject.SetActive(true);
+			return instance;
 		}
 
 		private Poolable CreateInstance()
 		{
-			var entity = Object.Instantiate(_prefab);
-			_instanceLookup.Add(entity.gameObject.GetHashCode(), this);
+			var instance = Object.Instantiate(_prefab);
+			_instanceLookup.Add(instance.gameObject, this);
 
-			return entity;
+			return instance;
 		}
 	}
 }

Runtime/PoolExtensions.cs

@@ -4,43 +4,20 @@ namespace ToolBox.Pools
 {
 	public static class PoolExtensions
 	{
-		public static void Populate(this GameObject prefab, int count)
-		{
-			var pool = Pool.GetPrefabPool(prefab);
-			pool.Populate(count);
-		}
-
-		public static GameObject Get(this GameObject prefab)
-		{
-			var pool = Pool.GetPrefabPool(prefab);
-			var entity = pool.Get();
-
-			return entity;
-		}
-
-		public static GameObject Get(this GameObject prefab, Transform parent, bool spawnInWorldSpace)
-		{
-			var pool = Pool.GetPrefabPool(prefab);
-			var entity = pool.Get(parent, spawnInWorldSpace);
+		public static void Populate(this GameObject prefab, int count) =>
+			Pool.GetPrefabPool(prefab).Populate(count);
 
-			return entity;
-		}
-
-		public static GameObject Get(this GameObject prefab, Vector3 position, Quaternion rotation)
-		{
-			var pool = Pool.GetPrefabPool(prefab);
-			var entity = pool.Get(position, rotation);
+		public static GameObject Get(this GameObject prefab) =>
+			Pool.GetPrefabPool(prefab).Get();
 
-			return entity;
-		}
+		public static GameObject Get(this GameObject prefab, Transform parent, bool spawnInWorldSpace) =>
+			Pool.GetPrefabPool(prefab).Get(parent, spawnInWorldSpace);
 
-		public static GameObject Get(this GameObject prefab, Vector3 position, Quaternion rotation, Transform parent, bool spawnInWorldSpace)
-		{
-			var pool = Pool.GetPrefabPool(prefab);
-			var entity = pool.Get(position, rotation, parent, spawnInWorldSpace);
+		public static GameObject Get(this GameObject prefab, Vector3 position, Quaternion rotation) =>
+			Pool.GetPrefabPool(prefab).Get(position, rotation);
 
-			return entity;
-		}
+		public static GameObject Get(this GameObject prefab, Vector3 position, Quaternion rotation, Transform parent, bool spawnInWorldSpace) =>
+			Pool.GetPrefabPool(prefab).Get(position, rotation, parent, spawnInWorldSpace);
 
 		public static T Get<T>(this GameObject prefab) where T : Component =>
 			prefab.Get().GetComponent<T>();
@@ -56,12 +33,12 @@ public static T Get<T>(this GameObject prefab, Vector3 position, Quaternion rota
 
 		public static void Release(this GameObject instance)
 		{
-			var pool = Pool.GetInstancePool(instance);
+			bool isPooled = Pool.TryGetInstancePool(instance, out var pool);
 
-			if (pool == null)
-				Object.Destroy(instance);
+			if (isPooled)
+				pool.Release(instance);
 			else
-				pool.Release(instance.GetComponent<Poolable>());
+				Object.Destroy(instance);
 		}
 	}
 }