Merge remote-tracking branch 'origin/develop' into develop-preview

# Conflicts:
#	Packages/src/CHANGELOG.md
#	Packages/src/package.json

Assets/Tests/Editor/NewTestScript.cs

@@ -1,16 +1,21 @@
 using System.Collections;
+using Coffee.UIParticleInternal;
 using NUnit.Framework;
+using UnityEngine;
 using UnityEngine.TestTools;
 
 namespace Coffee.UIParticle.Editor.Tests
 {
     public class NewTestScript
     {
-        // A Test behaves as an ordinary method
+        [TestCase(-1)]
-        [Test]
+        [TestCase(0)]
-        public void NewTestScriptSimplePasses()
+        [TestCase(2048)]
+        [TestCase(3000)]
+        public void GetParticleArray(int requiredSize)
         {
-            // Use the Assert class to test conditions
+            var array = ParticleSystemExtensions.GetParticleArray(requiredSize);
+            Debug.Log($"requiredSize: {requiredSize}, array.Length: {array.Length}");
         }
 
         // A UnityTest behaves like a coroutine in Play Mode. In Edit Mode you can use

Packages/src/Runtime/UIParticle.cs

@@ -9,6 +9,7 @@ using UnityEngine.Serialization;
 using Random = UnityEngine.Random;
 
 [assembly: InternalsVisibleTo("Coffee.UIParticle.Editor")]
+[assembly: InternalsVisibleTo("Coffee.UIParticle.Editor.Tests")]
 [assembly: InternalsVisibleTo("Coffee.UIParticle.PerformanceDemo")]
 [assembly: InternalsVisibleTo("Coffee.UIParticle.Demo")]
 

Packages/src/Runtime/Utilities/ParticleSystemExtensions.cs

@@ -13,11 +13,7 @@ namespace Coffee.UIParticleInternal
         {
             if (s_TmpParticles.Length < size)
             {
-                while (s_TmpParticles.Length < size)
+                size = Mathf.NextPowerOfTwo(size);
-                {
-                    size = Mathf.NextPowerOfTwo(size);
-                }
-
                 s_TmpParticles = new ParticleSystem.Particle[size];
             }
 
@@ -190,6 +186,8 @@ namespace Coffee.UIParticleInternal
             if (!self || !parent) return false;
 
             var subEmitters = parent.subEmitters;
+            if (!subEmitters.enabled) return false; // No sub emitters.
+
             var count = subEmitters.subEmittersCount;
             for (var i = 0; i < count; i++)
             {