v1.8

Author: IntoTheDev

Runtime/IPoolable.cs

@@ -2,7 +2,11 @@
 {
 	public interface IPoolable
 	{
-		void OnGet();
+		/// <summary>
+		/// This method will be called on 2nd Reuse call.
+		/// Use Unity's Awake method for first initialization and this method for others
+		/// </summary>
+		void OnReuse();
 		void OnRelease();
 	}
 }

Runtime/Pool.cs

@@ -1,9 +1,5 @@
 using System.Collections.Generic;
 using UnityEngine;
-#if ZENJECT
-using UnityEngine.SceneManagement;
-using Zenject;
-#endif
 
 namespace ToolBox.Pools
 {
@@ -13,16 +9,11 @@ internal sealed class Pool
         private readonly Stack<Poolable> _instances = null;
         private readonly Quaternion _rotation = default;
         private readonly Vector3 _scale = default;
-#if ZENJECT
-        private readonly DiContainer _projectContainer = null;
-        private DiContainer _sceneContainer = null;
-        private Scene _currentScene = default;
-#endif
-        
+
         private static readonly Dictionary<GameObject, Pool> _prefabLookup = new Dictionary<GameObject, Pool>(64);
         private static readonly Dictionary<GameObject, Pool> _instanceLookup = new Dictionary<GameObject, Pool>(512);
 
-        private const int CAPACITY = 128;
+        private const int INITIAL_SIZE = 128;
 
         public Pool(GameObject prefab)
         {
@@ -34,12 +25,8 @@ public Pool(GameObject prefab)
                 Object.DontDestroyOnLoad(_prefab);
                 _prefab.gameObject.SetActive(false);
             }
-
-#if ZENJECT
-            _projectContainer = ProjectContext.Instance.Container;
-            UpdateContainer();
-#endif
-            _instances = new Stack<Poolable>(CAPACITY);
+            
+            _instances = new Stack<Poolable>(INITIAL_SIZE);
             _prefabLookup.Add(prefab, this);
 
             var transform = prefab.transform;
@@ -57,8 +44,10 @@ public static Pool GetPrefabPool(GameObject prefab)
             return pool;
         }
 
-        public static bool TryGetInstancePool(GameObject instance, out Pool pool) =>
-            _instanceLookup.TryGetValue(instance, out pool);
+        public static bool TryGetInstancePool(GameObject instance, out Pool pool)
+        {
+            return _instanceLookup.TryGetValue(instance, out pool);
+        }
 
         public void Populate(int count)
         {
@@ -70,14 +59,14 @@ public void Populate(int count)
             }
         }
 
-        public GameObject Get()
+        public GameObject Reuse()
         {
             var instance = GetInstance();
 
             return instance.gameObject;
         }
 
-        public GameObject Get(Transform parent)
+        public GameObject Reuse(Transform parent)
         {
             var instance = GetInstance();
 
@@ -86,7 +75,7 @@ public GameObject Get(Transform parent)
             return instance.gameObject;
         }
 
-        public GameObject Get(Transform parent, bool worldPositionStays)
+        public GameObject Reuse(Transform parent, bool worldPositionStays)
         {
             var instance = GetInstance();
 
@@ -95,7 +84,7 @@ public GameObject Get(Transform parent, bool worldPositionStays)
             return instance.gameObject;
         }
 
-        public GameObject Get(Vector3 position, Quaternion rotation)
+        public GameObject Reuse(Vector3 position, Quaternion rotation)
         {
             var instance = GetInstance();
 
@@ -104,7 +93,7 @@ public GameObject Get(Vector3 position, Quaternion rotation)
             return instance.gameObject;
         }
 
-        public GameObject Get(Vector3 position, Quaternion rotation, Transform parent)
+        public GameObject Reuse(Vector3 position, Quaternion rotation, Transform parent)
         {
             var instance = GetInstance();
             var instanceTransform = instance.transform;
@@ -148,7 +137,7 @@ private Poolable GetInstance()
 
                         if (instance != null)
                         {
-                            instance.OnGet();
+                            instance.OnReuse();
                             instance.gameObject.SetActive(true);
 
                             return instance;
@@ -162,13 +151,11 @@ private Poolable GetInstance()
 
                     return instance;
                 }
-                else
-                {
-                    instance.OnGet();
-                    instance.gameObject.SetActive(true);
 
-                    return instance;
-                }
+                instance.OnReuse();
+                instance.gameObject.SetActive(true);
+
+                return instance;
             }
             else
             {
@@ -184,23 +171,8 @@ private Poolable CreateInstance()
             var instance = Object.Instantiate(_prefab);
             var instanceGameObject = instance.gameObject;
             _instanceLookup.Add(instanceGameObject, this);
-#if ZENJECT
-            if (!_currentScene.isLoaded)
-                UpdateContainer();
-            
-            _sceneContainer.InjectGameObject(instanceGameObject);
-#endif
 
             return instance;
         }
-
-#if ZENJECT
-        private void UpdateContainer()
-        {
-            _currentScene = SceneManager.GetActiveScene();
-            _sceneContainer = _projectContainer.Resolve<SceneContextRegistry>()
-                .GetContainerForScene(_currentScene);
-        }
-#endif
     }
 }

Runtime/PoolExtensions.cs

@@ -0,0 +1,76 @@
+using UnityEngine;
+
+namespace ToolBox.Pools
+{
+	public static class PoolHelper
+	{
+		public static void Populate(this GameObject prefab, int count)
+		{
+			Pool.GetPrefabPool(prefab).Populate(count);
+		}
+
+		public static GameObject Reuse(this GameObject prefab)
+		{
+			return Pool.GetPrefabPool(prefab).Reuse();
+		}
+
+		public static GameObject Reuse(this GameObject prefab, Transform parent)
+		{
+			return Pool.GetPrefabPool(prefab).Reuse(parent);
+		}
+
+		public static GameObject Reuse(this GameObject prefab, Transform parent, bool worldPositionStays)
+		{
+			return Pool.GetPrefabPool(prefab).Reuse(parent, worldPositionStays);
+		}
+
+		public static GameObject Reuse(this GameObject prefab, Vector3 position, Quaternion rotation)
+		{
+			return Pool.GetPrefabPool(prefab).Reuse(position, rotation);
+		}
+
+		public static GameObject Reuse(this GameObject prefab, Vector3 position, Quaternion rotation, Transform parent)
+		{
+			return Pool.GetPrefabPool(prefab).Reuse(position, rotation, parent);
+		}
+
+		public static T Reuse<T>(this GameObject prefab) where T : Component
+		{
+			return prefab.Reuse().GetComponent<T>();
+		}
+
+		public static T Reuse<T>(this GameObject prefab, Transform parent) where T : Component
+		{
+			return prefab.Reuse(parent).GetComponent<T>();
+		}
+
+		public static T Reuse<T>(this GameObject prefab, Transform parent, bool worldPositionStays) where T : Component
+		{
+			return prefab.Reuse(parent, worldPositionStays).GetComponent<T>();
+		}
+
+		public static T Reuse<T>(this GameObject prefab, Vector3 position, Quaternion rotation) where T : Component
+		{
+			return prefab.Reuse(position, rotation).GetComponent<T>();
+		}
+
+		public static T Reuse<T>(this GameObject prefab, Vector3 position, Quaternion rotation, Transform parent) where T : Component
+		{
+			return prefab.Reuse(position, rotation, parent).GetComponent<T>();
+		}
+
+		public static void Release(this GameObject instance)
+		{
+			bool isPooled = Pool.TryGetInstancePool(instance, out var pool);
+
+			if (isPooled)
+			{
+				pool.Release(instance);
+			}
+			else
+			{
+				Object.Destroy(instance);
+			}
+		}
+	}
+}

Runtime/PoolHelper.cs

@@ -15,11 +15,13 @@ private void Awake()
 			_isInitialized = true;
 		}
 
-		public void OnGet()
+		public void OnReuse()
 		{
-			if (_isInitialized)
-				for (int i = 0; i < _poolables.Length; i++)
-					_poolables[i].OnGet();
+			if (!_isInitialized)
+				return;
+			
+			for (int i = 0; i < _poolables.Length; i++)
+				_poolables[i].OnReuse();
 		}
 
 		public void OnRelease()

Runtime/PoolExtensions.cs.meta renamed to Runtime/PoolHelper.cs.meta

@@ -1,6 +1,6 @@
 {
   "name": "com.intothedev.objectpooling",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "displayName": "Object Pooling",
   "description": "Object Pooling for Unity.",
   "author": {