Change set active after set parent and set transform

expressobits · Oct 24, 2021 · 732c8eb · 732c8eb
1 parent a734719
commit 732c8eb
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/Runtime/Scripts/Pool.cs b/Runtime/Scripts/Pool.cs
@@ -37,34 +37,41 @@ public void Setup(PoolSettings settings, GameObject prefab)
 
         public GameObject Instantiate()
         {
-            return Dequeue();
+            GameObject gameObject = Dequeue();
+            gameObject.SetActive(true);
+            return gameObject;
         }
 
         public GameObject Instantiate(Vector3 position, Quaternion rotation)
         {
-            GameObject gameObject = Instantiate();
+            GameObject gameObject = Dequeue();
             gameObject.transform.SetPositionAndRotation(position, rotation);
+            gameObject.SetActive(true);
             return gameObject;
         }
 
         public GameObject Instantiate(Transform parent)
         {
-            GameObject gameObject = Instantiate();
+            GameObject gameObject = Dequeue();
             gameObject.transform.SetParent(parent);
+            gameObject.SetActive(true);
             return gameObject;
         }
 
         public GameObject Instantiate(Transform parent, bool instantiateInWorldSpace)
         {
-            GameObject gameObject = Instantiate();
+            GameObject gameObject = Dequeue();
             gameObject.transform.SetParent(parent, instantiateInWorldSpace);
+            gameObject.SetActive(true);
             return gameObject;
         }
 
         public GameObject Instantiate(Vector3 position, Quaternion rotation, Transform parent)
         {
-            GameObject gameObject = Instantiate(position, rotation);
+            GameObject gameObject = Dequeue();
+            gameObject.transform.SetPositionAndRotation(position, rotation);
             gameObject.transform.SetParent(parent);
+            gameObject.SetActive(true);
             return gameObject;
         }
 
@@ -129,7 +136,6 @@ private GameObject Dequeue()
                 obj = Object.Instantiate(prefab);
             }
             OnPoolerEnable(obj);
-            obj.SetActive(true);
             OnDequeue?.Invoke(this,obj);
 
             // NOTE This exists for cases that have calls in two instantaneous locations and only one has pooldata as a reference.