From bb815ebb1721165159519be8aa1bb37fae2ed6fa Mon Sep 17 00:00:00 2001 From: Brett Johnson Date: Sat, 18 Jun 2016 09:14:35 -0700 Subject: [PATCH 1/4] Support for RectTransform --- Assets/ObjectPool/Scripts/ObjectPool.cs | 32 ++++++++++++++------- ProjectSettings/ClusterInputManager.asset | Bin 0 -> 4104 bytes ProjectSettings/GraphicsSettings.asset | Bin 4112 -> 4256 bytes ProjectSettings/NavMeshAreas.asset | Bin 0 -> 9292 bytes ProjectSettings/ProjectSettings.asset | Bin 24764 -> 36857 bytes ProjectSettings/ProjectVersion.txt | 2 ++ ProjectSettings/UnityAdsSettings.asset | Bin 0 -> 4116 bytes ProjectSettings/UnityConnectSettings.asset | Bin 0 -> 4116 bytes 8 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 ProjectSettings/ClusterInputManager.asset create mode 100644 ProjectSettings/NavMeshAreas.asset create mode 100644 ProjectSettings/ProjectVersion.txt create mode 100644 ProjectSettings/UnityAdsSettings.asset create mode 100644 ProjectSettings/UnityConnectSettings.asset diff --git a/Assets/ObjectPool/Scripts/ObjectPool.cs b/Assets/ObjectPool/Scripts/ObjectPool.cs index fba6c17..23f528e 100755 --- a/Assets/ObjectPool/Scripts/ObjectPool.cs +++ b/Assets/ObjectPool/Scripts/ObjectPool.cs @@ -15,10 +15,10 @@ public class StartupPool static ObjectPool _instance; static List tempList = new List(); - + Dictionary> pooledObjects = new Dictionary>(); Dictionary spawnedObjects = new Dictionary(); - + public StartupPoolMode startupPoolMode; public StartupPool[] startupPools; @@ -75,7 +75,7 @@ public static void CreatePool(GameObject prefab, int initialPoolSize) } } } - + public static T Spawn(T prefab, Transform parent, Vector3 position, Quaternion rotation) where T : Component { return Spawn(prefab.gameObject, parent, position, rotation).GetComponent(); @@ -118,7 +118,11 @@ public static GameObject Spawn(GameObject prefab, Transform parent, Vector3 posi if (obj != null) { trans = obj.transform; - trans.parent = parent; + if (parent != null) + { + bool worldPositionStays = (parent.GetComponent() == null); + trans.SetParent(parent, worldPositionStays); + } trans.localPosition = position; trans.localRotation = rotation; obj.SetActive(true); @@ -128,7 +132,11 @@ public static GameObject Spawn(GameObject prefab, Transform parent, Vector3 posi } obj = (GameObject)Object.Instantiate(prefab); trans = obj.transform; - trans.parent = parent; + if (parent != null) + { + bool worldPositionStays = (parent.GetComponent() == null); + trans.SetParent(parent, worldPositionStays); + } trans.localPosition = position; trans.localRotation = rotation; instance.spawnedObjects.Add(obj, prefab); @@ -138,7 +146,11 @@ public static GameObject Spawn(GameObject prefab, Transform parent, Vector3 posi { obj = (GameObject)Object.Instantiate(prefab); trans = obj.GetComponent(); - trans.parent = parent; + if (parent != null) + { + bool worldPositionStays = (parent.GetComponent() == null); + trans.SetParent(parent, worldPositionStays); + } trans.localPosition = position; trans.localRotation = rotation; return obj; @@ -205,7 +217,7 @@ public static void RecycleAll() Recycle(tempList[i]); tempList.Clear(); } - + public static bool IsSpawned(GameObject obj) { return instance.spawnedObjects.ContainsKey(obj); @@ -356,7 +368,7 @@ public static void CreatePool(this GameObject prefab, int initialPoolSize) { ObjectPool.CreatePool(prefab, initialPoolSize); } - + public static T Spawn(this T prefab, Transform parent, Vector3 position, Quaternion rotation) where T : Component { return ObjectPool.Spawn(prefab, parent, position, rotation); @@ -405,7 +417,7 @@ public static GameObject Spawn(this GameObject prefab) { return ObjectPool.Spawn(prefab, null, Vector3.zero, Quaternion.identity); } - + public static void Recycle(this T obj) where T : Component { ObjectPool.Recycle(obj); @@ -509,4 +521,4 @@ public static void DestroyAll(this T prefab) where T : Component { ObjectPool.DestroyAll(prefab.gameObject); } -} +} \ No newline at end of file diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset new file mode 100644 index 0000000000000000000000000000000000000000..de328e54b63137f319ce1e898a42e60c12fbf15f GIT binary patch literal 4104 zcmeH_yGjE=6o$|2=HmTsCBA?~AV{zc#6k-Nk=RO*QIsUe=28!6ZR;DD!p?UQA&8BZ zc?Q@2-&s}`Q(K*Z!@=n~>9>%-4Pe+hY-K3;38KA&)!{%Xbx$@ku+@3IEY zLEq?eIq*KOdn}Fipx3w2VfS{>KWcSbS2mK)c~bUri=g{y-~)fD&eQ>QKpjvA)B$xs9Z(0<0d+tfPzV0QfgebudzJtI literal 0 HcmV?d00001 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 4c8d52669a4c52529be384cb3b05b9a212392beb..96548d5ef7218d34a18c32ab9fc5ee6908d02ebe 100644 GIT binary patch literal 4256 zcmeH~-HsGR6vt2R&Mtx|g5Vdrh=Qo#^5upY2rja_^0CH&F@|t6DSB#W+RSuMYI?G} zF(DJKd;+gGG4X~QqAy{*yj6Vewc!Zx;Bk(DQoU z^1NKnLGb6*^S0-KJcRzYv){oiqpTiTh4zo*y!U01+}6JbL0SJH^3izx?|NSD=V5XP z`+OWRSU=;uM>ry{$rbcx*~Nd~^O@51IszUn(tkGVe}27=l4oO9ZXhD#)BeEoTIsy} z{@J`UrSpDBzG&-V9~ub4I3IZ)WOh|D?hn zI6hzDzdL@i!k;*Ps={aSfWeaBe$Rw;vYum(^Lazb`8mhWTI~6f#4b5y)J@T4a!Q?)mN9G)K%Ka zlzit+z1G!X8YS@n%d5Jr!p(dQ;8J&8Z4R!+VRzWlEgO%Hb)&lpit(tB`CDZo6{nYz zu8Vw8>RpwtC8jrafC?B6bR#rc$Bn)UH5Ze0rsMfr-zd}8X=TTMuatK2D8n@AsWb|q zuSV@o+Ee{TYNCE0Ee2aj+C?*Wxvq5|A<7|z61PO!LjT}ZeOd| npF2B$rGEAbjfL}eG22_vrwaN$_pU&nx%|BWI_;taxd1)|e}a2l literal 4112 zcmeH~OHRZv42C_tSurQz2*YDoBBViRperg>tfREGXi(chNeYzHaWaaXHc}TH!Im87 z@!O8RtOBt30az{p;FKZ-fSc8Nb(vqm?=TDtTA!0YTK!&`!e!{aX~pcro?TnDeHg^qmW~qe~@ZtDPdE8>fR-7QFkSlS*1&~F7)BL zY%zu7##-G^Bj06zI*%I8$;P`l^NpcBUx6)Zc%G)--j2=gpwwQ&3GE*85m{8usx@kB zYD^wN#iLOcbWuBXZB(j#HR+E3(Z%{Pk6(a!v&TKwz*!i_!J^xBwm^5$wZ``EO@Guion`Ugx@Qkeh% diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset new file mode 100644 index 0000000000000000000000000000000000000000..7e9342e8d464d450f9e695cd6c52d34a8998036e GIT binary patch literal 9292 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 X`M*D09sC!!GynK&3IBN^lI8h7Fs)r* literal 24764 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 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt new file mode 100644 index 0000000..558807b --- /dev/null +++ b/ProjectSettings/ProjectVersion.txt @@ -0,0 +1,2 @@ +m_EditorVersion: 5.3.5f1 +m_StandardAssetsVersion: 0 diff --git a/ProjectSettings/UnityAdsSettings.asset b/ProjectSettings/UnityAdsSettings.asset new file mode 100644 index 0000000000000000000000000000000000000000..b8c7eb75bdf890bdf72e0717aa46a2f4a32f051b GIT binary patch literal 4116 zcmeH~%}T>S6ov0JYW=BI!JXTRyFx9+ZM!I1P*iGlB@#(0kv5TLy3kc#!52{6xYvb` z;?g(Kc+MnMM4v!r;LhCp&CSW=%qk*<8Ik2x5m~~DMWj)!R~!ABe57fr6hH;j?aNdB zp?Grlx_*3LdheCX;4Xsu99tp@`cqRRE$T_v7nQ`iGq9mI}a8PFlyp5da!Ph~Ryr62x801A@)g*W14Qvh1P-m9hgd>OG zmk8E#Up&*tp3$Gj`j`F!`M!QJ7Y6#e<;7iJ>ma;{Wq8&B3fw_(kS suBiO_CL4CO4p;}Q1J(iSfOWt+U>&dySO=^F)`9=!0RH{>OFa3gPttQ@{r~^~ literal 0 HcmV?d00001 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset new file mode 100644 index 0000000000000000000000000000000000000000..ec04bc797d6203c3003eb46678cbe1bf16752d2b GIT binary patch literal 4116 zcmeH~y-EW?6ov03@h|@WRkjv327)A7Mnq6hqQsOUOWeejxCy%xAy!-1_zV_yb~fSz z_!>4gcD{j)>p8od7%;Wf4BVZ2zqxy6I6KXXq&$(iB@vm$j7g-B+sGB_dHD{*P$_^S z9uL{Ox5XFlYvE(H{dxbiHV=M_;5x^qNPzw@DgtsPk7)^>l>`|;_Qj!O895`Bgalkm z$pJJ@(a*j#f}_XRqg;eqQX*Hfg_Oa4M=%f5870T)>6D{fWGte;yr(}-UW)l1&Tpfn z{sehIo>qBe4Du|nDv@X89c%^f@Qjn>QDo#8{1U->s?SqGeT|wr)0pM;ul@}1FnxTj zq5AxU+^6a~y1UbIUAv|$w$_f@@MCz?@oE>A576gVXD7C=4_oJU+_LRj&8~K8{y@h* z1RbmC+}LHeqAgE%+7iFFdu_YA>NS%Ro7SBMYn}rmnWCH*jn}EDlB*I?^Dqt=2aE&8 a0poyiz&KzWFb)_8j047je{*2qC+!C&rFX&r literal 0 HcmV?d00001 From cbcb74a45a59e640a9bcdcae0e660f67a8e159e5 Mon Sep 17 00:00:00 2001 From: Brett Johnson Date: Sat, 18 Jun 2016 10:13:07 -0700 Subject: [PATCH 2/4] Spawn now creates a pool if one is not found. As a result, CreatePool isn't required for initial setup. And the fallback to normal instantiation is no longer needed and has been removed. Added a warning for when Recycle gets called but no pool is found. --- Assets/ObjectPool/Scripts/ObjectPool.cs | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/Assets/ObjectPool/Scripts/ObjectPool.cs b/Assets/ObjectPool/Scripts/ObjectPool.cs index 23f528e..223b7e0 100755 --- a/Assets/ObjectPool/Scripts/ObjectPool.cs +++ b/Assets/ObjectPool/Scripts/ObjectPool.cs @@ -104,7 +104,8 @@ public static GameObject Spawn(GameObject prefab, Transform parent, Vector3 posi { List list; Transform trans; - GameObject obj; + GameObject obj = null; + CreatePool(prefab.gameObject, 0); // will create pool if none exists if (instance.pooledObjects.TryGetValue(prefab, out list)) { obj = null; @@ -140,21 +141,8 @@ public static GameObject Spawn(GameObject prefab, Transform parent, Vector3 posi trans.localPosition = position; trans.localRotation = rotation; instance.spawnedObjects.Add(obj, prefab); - return obj; - } - else - { - obj = (GameObject)Object.Instantiate(prefab); - trans = obj.GetComponent(); - if (parent != null) - { - bool worldPositionStays = (parent.GetComponent() == null); - trans.SetParent(parent, worldPositionStays); - } - trans.localPosition = position; - trans.localRotation = rotation; - return obj; } + return obj; } public static GameObject Spawn(GameObject prefab, Transform parent, Vector3 position) { @@ -185,9 +173,14 @@ public static void Recycle(GameObject obj) { GameObject prefab; if (instance.spawnedObjects.TryGetValue(obj, out prefab)) + { Recycle(obj, prefab); + } else + { + Debug.LogWarning(obj.name + "can not be recycled because it was never pooled. It will be destroyed instead."); Object.Destroy(obj); + } } static void Recycle(GameObject obj, GameObject prefab) { From 6d5d3638d6cdc199df15e43281d8cb3100887e81 Mon Sep 17 00:00:00 2001 From: Brett Johnson Date: Sat, 18 Jun 2016 11:44:00 -0700 Subject: [PATCH 3/4] SetParent used to fix UI spawning issues. --- Assets/ObjectPool/Scripts/ObjectPool.cs | 5 ++--- ObjectPool.userprefs | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Assets/ObjectPool/Scripts/ObjectPool.cs b/Assets/ObjectPool/Scripts/ObjectPool.cs index 223b7e0..dbd90d1 100755 --- a/Assets/ObjectPool/Scripts/ObjectPool.cs +++ b/Assets/ObjectPool/Scripts/ObjectPool.cs @@ -64,11 +64,10 @@ public static void CreatePool(GameObject prefab, int initialPoolSize) { bool active = prefab.activeSelf; prefab.SetActive(false); - Transform parent = instance.transform; while (list.Count < initialPoolSize) { var obj = (GameObject)Object.Instantiate(prefab); - obj.transform.parent = parent; + obj.transform.SetParent(instance.transform, false); // worldPositionStays=false to keep UI objects spawning consistently list.Add(obj); } prefab.SetActive(active); @@ -186,7 +185,7 @@ static void Recycle(GameObject obj, GameObject prefab) { instance.pooledObjects[prefab].Add(obj); instance.spawnedObjects.Remove(obj); - obj.transform.parent = instance.transform; + obj.transform.SetParent(instance.transform, false); // worldPositionStays=false to keep UI objects spawning consistently obj.SetActive(false); } diff --git a/ObjectPool.userprefs b/ObjectPool.userprefs index 66f209e..47e6068 100644 --- a/ObjectPool.userprefs +++ b/ObjectPool.userprefs @@ -1,8 +1,8 @@ - - + + - + From be6ba79fdaec61f758cf9d7a7da7afa0ef108b13 Mon Sep 17 00:00:00 2001 From: Brett Johnson Date: Sat, 18 Jun 2016 11:57:01 -0700 Subject: [PATCH 4/4] Simplified SetParent setup --- Assets/ObjectPool/Scripts/ObjectPool.cs | 6 ++---- ObjectPool.userprefs | 6 +----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Assets/ObjectPool/Scripts/ObjectPool.cs b/Assets/ObjectPool/Scripts/ObjectPool.cs index dbd90d1..97ee7fc 100755 --- a/Assets/ObjectPool/Scripts/ObjectPool.cs +++ b/Assets/ObjectPool/Scripts/ObjectPool.cs @@ -120,8 +120,7 @@ public static GameObject Spawn(GameObject prefab, Transform parent, Vector3 posi trans = obj.transform; if (parent != null) { - bool worldPositionStays = (parent.GetComponent() == null); - trans.SetParent(parent, worldPositionStays); + trans.SetParent(parent, false); // worldPositionStays=false to keep UI objects spawning consistently } trans.localPosition = position; trans.localRotation = rotation; @@ -134,8 +133,7 @@ public static GameObject Spawn(GameObject prefab, Transform parent, Vector3 posi trans = obj.transform; if (parent != null) { - bool worldPositionStays = (parent.GetComponent() == null); - trans.SetParent(parent, worldPositionStays); + trans.SetParent(parent, false); // worldPositionStays=false to keep UI objects spawning consistently } trans.localPosition = position; trans.localRotation = rotation; diff --git a/ObjectPool.userprefs b/ObjectPool.userprefs index 47e6068..ff50da4 100644 --- a/ObjectPool.userprefs +++ b/ObjectPool.userprefs @@ -1,10 +1,6 @@  - - - - - +