Improving pool and fixing minor leaks

Author: ertanturan

Assets/CustomTools/ObjectPooling/Scripts/ObjectPool/IPooledObject.cs

@@ -1,5 +1,6 @@
 public interface IPooledObject
 {
+    PooledObjectType PoolType { get; set; }
     void Init();
     void OnObjectSpawn();
     void OnObjectDespawn();

Assets/CustomTools/ObjectPooling/Scripts/ObjectPool/ObjectPooler.cs

@@ -1,5 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEngine;
 
 public class ObjectPooler : MonoBehaviour
@@ -39,12 +38,14 @@ private void Start()
             {
                 GameObject obj = Instantiate(Pool[j].Prefab);
                 obj.transform.parent = poolSpecifiMaster.transform;
-
-                if (obj.GetComponent<IPooledObject>() == null)
+                IPooledObject iPool = obj.GetComponent<IPooledObject>();
+                if (iPool == null)
                 {
                     PooledObject temp = obj.AddComponent<PooledObject>();
-                    temp.Type = Pool[j].Tag;
+                    iPool = temp;
                 }
+                iPool.PoolType = Pool[j].Tag;
+
 
                 obj.SetActive(false);
                 objectPool.Enqueue(obj);
@@ -66,14 +67,15 @@ public GameObject SpawnFromPool(PooledObjectType tag, Vector3 pos, Quaternion ro
 
         GameObject objToSpawn;
 
-        if(PoolDictionary[tag].Count!=0)
+        if (PoolDictionary[tag].Count != 0)
         {
             objToSpawn = PoolDictionary[tag].Peek();
             objToSpawn.SetActive(true);
             objToSpawn.transform.position = pos;
             objToSpawn.transform.rotation = rot;
 
             IPooledObject iPooledObj = objToSpawn.GetComponent<IPooledObject>();
+
             iPooledObj.Init();
             iPooledObj.OnObjectSpawn();
 
@@ -87,7 +89,7 @@ public GameObject SpawnFromPool(PooledObjectType tag, Vector3 pos, Quaternion ro
         return objToSpawn;
     }
 
-    public void Despawn(PooledObjectType tag,GameObject obj)
+    public void Despawn(PooledObjectType tag, GameObject obj)
     {
 
         PoolDictionary[tag].Enqueue(obj);
@@ -108,12 +110,15 @@ private GameObject ExpandPool(PooledObjectType tag, Vector3 pos, Quaternion rot)
         temp.transform.position = pos;
         temp.transform.rotation = rot;
 
-        if (temp.GetComponent<IPooledObject>() == null)
+        IPooledObject iPool = temp.GetComponent<IPooledObject>();
+        if (iPool == null)
         {
             PooledObject tempPool = temp.AddComponent<PooledObject>();
-            tempPool.Type = tag;
+            iPool = tempPool;
         }
 
+        iPool.PoolType = tag;
+
         IPooledObject iPooledObj = temp.GetComponent<IPooledObject>();
         iPooledObj.Init();
         iPooledObj.OnObjectSpawn();

Assets/CustomTools/ObjectPooling/Scripts/ObjectPool/PooledObject.cs

@@ -4,7 +4,7 @@ public class PooledObject : MonoBehaviour, IPooledObject
 {
 
 
-    public PooledObjectType Type;
+    public PooledObjectType PoolType { get; set; }
 
 
 
@@ -25,7 +25,7 @@ public virtual void Init()
 
     public void Despawn()
     {
-        ObjectPooler.Instance.Despawn(Type, gameObject);
+        ObjectPooler.Instance.Despawn(PoolType, gameObject);
     }
 
 

Assets/CustomTools/ObjectPooling/Scripts/ObjectPool/PooledObjectType.cs

@@ -1,6 +1,6 @@
 public enum PooledObjectType
 {
-    Cube=0,
-    Sphere=10,
-    CubeAndSphere=20
+    Type1 = 0,
+    Type2 = 10,
+    Type3 = 20
 }

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.2.16f1
-m_EditorVersionWithRevision: 2019.2.16f1 (b9898e2d04a4)
+m_EditorVersion: 2019.2.21f1
+m_EditorVersionWithRevision: 2019.2.21f1 (9d528d026557)