Optimization

Author: IntoTheDev

Pool.cs

@@ -13,6 +13,7 @@ public class Pool
 
 		private Queue<Poolable> entities = null;
 		private bool isFilled = false;
+		private int currentCount = 0;
 
 		public Pool(Poolable prefab, int startCount, bool isResizable, Transform holder)
 		{
@@ -28,6 +29,7 @@ public void Fill()
 				return;
 
 			entities = new Queue<Poolable>(startCount);
+			currentCount = startCount;
 
 			for (int i = 0; i < startCount; i++)
 			{
@@ -44,6 +46,9 @@ public Poolable GetEntity()
 		{
 			Poolable entity = TakeEntity();
 
+			if (IsEmpty(entity))
+				return null;
+
 			entity.ReturnFromPool();
 
 			return entity;
@@ -53,6 +58,9 @@ public Poolable GetEntity(Transform parent, bool spawnInWorldSpace)
 		{
 			Poolable entity = TakeEntity();
 
+			if (IsEmpty(entity))
+				return null;
+
 			entity.transform.SetParent(parent, spawnInWorldSpace);
 			entity.ReturnFromPool();
 
@@ -63,6 +71,9 @@ public Poolable GetEntity(Vector3 position, Quaternion rotation)
 		{
 			Poolable entity = TakeEntity();
 
+			if (IsEmpty(entity))
+				return null;
+
 			entity.transform.SetPositionAndRotation(position, rotation);
 			entity.ReturnFromPool();
 
@@ -72,6 +83,10 @@ public Poolable GetEntity(Vector3 position, Quaternion rotation)
 		public Poolable GetEntity(Vector3 position, Quaternion rotation, Transform parent, bool spawnInWorldSpace)
 		{
 			Poolable entity = TakeEntity();
+
+			if (IsEmpty(entity))
+				return null;
+
 			Transform entityTransform = entity.transform;
 
 			entityTransform.SetParent(parent, spawnInWorldSpace);
@@ -87,6 +102,7 @@ public void ReturnEntity(Poolable entity)
 				return;
 
 			entities.Enqueue(entity);
+			currentCount++;
 
 			entity.transform.SetParent(holder, false);
 			entity.gameObject.SetActive(false);
@@ -99,7 +115,7 @@ private Poolable TakeEntity()
 
 			Poolable entity;
 
-			if (entities.Count == 0)
+			if (currentCount == 0)
 			{
 				if (isResizable)
 				{
@@ -119,11 +135,15 @@ private Poolable TakeEntity()
 			{
 				entity = Object.Instantiate(prefab, holder);
 				entity.SetPool(this);
+				currentCount++;
 			}
 
 			entity.gameObject.SetActive(true);
+			currentCount--;
 
 			return entity;
 		}
+
+		private bool IsEmpty(Poolable entity) => !isResizable && entity == null;
 	}
 }