chore(release): 3.3.8 [skip ci]

## [3.3.8](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.3.7...3.3.8) (2021-06-08)

### Bug Fixes

* improve performance ([e352d15](e352d153ce))

.github/workflows/release.yml

@@ -12,12 +12,13 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
-    if: "! contains(github.event.head_commit.message, '[skip ci]') && ! contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - uses: actions/checkout@v2
 
-      - run: |
-          npm i --no-save https://gist.github.com/mob-sakai/c90044338361af97a7e8c8a78425bdb3
-          npx semantic-release -e @mob-sakai/semantic-release-upm
+      - uses: cycjimmy/semantic-release-action@v2
+        with:
+          extra_plugins: |
+            @semantic-release/changelog
+            @semantic-release/git
         env:
           GITHUB_TOKEN: ${{ github.token }}

.github/workflows/test.yml

@@ -29,8 +29,6 @@ jobs:
             "2020.1.17f1",
             "2020.2.1f1",
           ]
-    env:
-      UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
 
     steps:
       # Checkout sandbox project
@@ -64,9 +62,9 @@ jobs:
         uses: game-ci/unity-test-runner@main
         with:
           unityVersion: ${{ matrix.unityVersion }}
-          customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
-          customParameters: -enableCodeCoverage
-          # customParameters: -enableCodeCoverage -coverageOptions assemblyFilters:+CSharpCompilerSettings_,-*-CSharp,-*.Tests,-IgnoreAccessibility
+          customParameters: -nographics -enableCodeCoverage -coverageOptions assemblyFilters:+Coffee.UIParticle.*Tests
+        env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
 
       - uses: actions/upload-artifact@v2
         if: always()

.releaserc.json

@@ -0,0 +1,25 @@
+{
+  "branches": [
+    "+([0-9])?(.{+([0-9]),x}).x",
+    "master",
+    "main",
+    {
+      "name": "preview",
+      "prerelease": true
+    }
+  ],
+  "tagFormat": "${version}",
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    "@semantic-release/changelog",
+    [
+      "@semantic-release/npm",
+      {
+        "npmPublish": false
+      }
+    ],
+    "@semantic-release/git",
+    "@semantic-release/github"
+  ]
+}

CHANGELOG.md

@@ -1,3 +1,42 @@
+## [3.3.8](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.3.7...3.3.8) (2021-06-08)
+
+
+### Bug Fixes
+
+* improve performance ([e352d15](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/e352d153cef8c1efb2792e35010d7eed1e31a040))
+
+## [3.3.7](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.3.6...3.3.7) (2021-06-02)
+
+
+### Bug Fixes
+
+* Refresh() will be called multiple times in the same frame, due to external assets ([0b9d80d](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/0b9d80da939580c72ca1471081d7a034edc985d4))
+
+## [3.3.6](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.3.5...3.3.6) (2021-05-11)
+
+
+### Bug Fixes
+
+* In rare cases, the generated camera (for baking) will not be deactivated ([12c748a](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/12c748a8cd4adfd2dc5f085cec77050431f261a4))
+* remove from "Add Component" menu ([476c402](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/476c4027ff5f70fb9b4c026dd5fc59bf5a876227))
+
+## [3.3.5](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.3.4...3.3.5) (2021-02-28)
+
+
+### Bug Fixes
+
+* fix cached position for pre-warmed particles ([e3f42d7](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/e3f42d747a7fd973b5813cc72a9444943a6c3ad0))
+* ParticleSystem creates particles in wrong position during pre-warm ([b93e0e4](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/b93e0e4701c7011176eeec5c109dda7f4ea632e0)), closes [#147](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/147)
+
+## [3.3.4](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.3.3...3.3.4) (2021-02-22)
+
+
+### Bug Fixes
+
+* Multiselecting sets all scales to the same value ([13223b2](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/13223b2d747609cf88b424ad590bda7f857b387d))
+* support sub emitter with 'PlayOnAwake' ([d5ce78a](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/d5ce78ae5acf2740ba7fdc6cde9f197c4e165484))
+* The maximum material count is 8 ([3bb5241](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/3bb52412751360409747192150188ae904f2c3d3))
+
 ## [3.3.3](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.3.2...3.3.3) (2021-02-03)
 
 

Scripts/BakingCamera.cs

@@ -2,6 +2,7 @@
 
 namespace Coffee.UIParticleExtensions
 {
+    [AddComponentMenu("")]
     internal class BakingCamera : MonoBehaviour
     {
         static BakingCamera s_Instance;
@@ -40,12 +41,11 @@ namespace Coffee.UIParticleExtensions
                 // Find instance in scene, or create new one.
                 return s_Instance
                     ? s_Instance
-                    : (s_Instance = FindObjectOfType<BakingCamera>() ?? Create());
+                    : (s_Instance = Create());
             }
         }
 
         private Camera _camera;
-        // private int _refCount;
 
         private static BakingCamera Create()
         {
@@ -56,6 +56,7 @@ namespace Coffee.UIParticleExtensions
 
             var inst = gameObject.AddComponent<BakingCamera>();
             inst._camera = gameObject.AddComponent<Camera>();
+            inst._camera.enabled = false;
             inst._camera.orthographic = true;
 
             // Turn camera off because particle mesh baker will use only camera matrix

Scripts/Editor/UIParticleEditor.cs

@@ -22,8 +22,6 @@ namespace Coffee.UIExtensions
         private static readonly GUIContent s_ContentTrailMaterial = new GUIContent("Trail Material");
         private static readonly GUIContent s_Content3D = new GUIContent("3D");
         private static readonly GUIContent s_ContentScale = new GUIContent("Scale");
-        private static readonly List<UIParticle> s_TempParents = new List<UIParticle>();
-        private static readonly List<UIParticle> s_TempChildren = new List<UIParticle>();
 
         private SerializedProperty _spMaskable;
         private SerializedProperty _spScale;
@@ -250,20 +248,27 @@ namespace Coffee.UIExtensions
             EditorGUILayout.BeginHorizontal();
             if (showXyz)
             {
+                EditorGUI.BeginChangeCheck();
                 EditorGUILayout.PropertyField(sp);
+                if (EditorGUI.EndChangeCheck())
+                {
+                    x.floatValue = Mathf.Max(0.001f, x.floatValue);
+                    y.floatValue = Mathf.Max(0.001f, y.floatValue);
+                    z.floatValue = Mathf.Max(0.001f, z.floatValue);
+                }
             }
             else
             {
                 EditorGUI.BeginChangeCheck();
                 EditorGUILayout.PropertyField(x, s_ContentScale);
                 if (EditorGUI.EndChangeCheck())
-                    z.floatValue = y.floatValue = x.floatValue;
+                {
+                    x.floatValue = Mathf.Max(0.001f, x.floatValue);
+                    y.floatValue = Mathf.Max(0.001f, x.floatValue);
+                    z.floatValue = Mathf.Max(0.001f, x.floatValue);
+                }
             }
 
-            x.floatValue = Mathf.Max(0.001f, x.floatValue);
-            y.floatValue = Mathf.Max(0.001f, y.floatValue);
-            z.floatValue = Mathf.Max(0.001f, z.floatValue);
-
             EditorGUI.BeginChangeCheck();
             showXyz = GUILayout.Toggle(showXyz, s_Content3D, EditorStyles.miniButton, GUILayout.Width(30));
             if (EditorGUI.EndChangeCheck() && !showXyz)

Scripts/UIParticle.cs

@@ -1,6 +1,7 @@
 #if UNITY_2019_3_11 || UNITY_2019_3_12 || UNITY_2019_3_13 || UNITY_2019_3_14 || UNITY_2019_3_15 || UNITY_2019_4_OR_NEWER
 #define SERIALIZE_FIELD_MASKABLE
 #endif
+using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Coffee.UIParticleExtensions;
@@ -60,6 +61,7 @@ namespace Coffee.UIExtensions
         private static readonly List<Material> s_PrevMaskMaterials = new List<Material>();
         private static readonly List<Material> s_PrevModifiedMaterials = new List<Material>();
         private static readonly List<Component> s_Components = new List<Component>();
+        private static readonly List<ParticleSystem> s_ParticleSystems = new List<ParticleSystem>();
 
 
         /// <summary>
@@ -176,6 +178,11 @@ namespace Coffee.UIExtensions
             particles.Exec(p => p.Stop());
         }
 
+        public void Clear()
+        {
+            particles.Exec(p => p.Clear());
+        }
+
         public void SetParticleSystemInstance(GameObject instance)
         {
             SetParticleSystemInstance(instance, true);
@@ -266,7 +273,7 @@ namespace Coffee.UIExtensions
 
             //
             GetComponents(typeof(IMaterialModifier), s_Components);
-            var materialCount = Mathf.Max(8, count);
+            var materialCount = Mathf.Min(8, count);
             canvasRenderer.materialCount = materialCount;
             var j = 0;
             for (var i = 0; i < particles.Count; i++)
@@ -388,7 +395,6 @@ namespace Coffee.UIExtensions
 #if !SERIALIZE_FIELD_MASKABLE
             maskable = m_Maskable;
 #endif
-            _cachedPosition = transform.position;
             activeMeshIndices.Clear();
 
             UIParticleUpdater.Register(this);
@@ -407,6 +413,25 @@ namespace Coffee.UIExtensions
             InitializeIfNeeded();
         }
 
+        private new IEnumerator Start()
+        {
+            // #147: ParticleSystem creates Particles in wrong position during prewarm
+            // #148: Particle Sub Emitter not showing when start game
+            var delayToPlay = particles.AnyFast(ps =>
+            {
+                ps.GetComponentsInChildren(false, s_ParticleSystems);
+                return s_ParticleSystems.AnyFast(p => p.isPlaying && (p.subEmitters.enabled || p.main.prewarm));
+            });
+            s_ParticleSystems.Clear();
+            if (!delayToPlay) yield break;
+
+            Stop();
+            Clear();
+            yield return null;
+
+            Play();
+        }
+
         /// <summary>
         /// This function is called when the behaviour becomes disabled.
         /// </summary>

Scripts/UIParticleUpdater.cs

@@ -11,6 +11,7 @@ namespace Coffee.UIExtensions
         static readonly List<UIParticle> s_ActiveParticles = new List<UIParticle>();
         static MaterialPropertyBlock s_Mpb;
         static ParticleSystem.Particle[] s_Particles = new ParticleSystem.Particle[2048];
+        private static int frameCount = 0;
 
 
         public static void Register(UIParticle particle)
@@ -41,6 +42,10 @@ namespace Coffee.UIExtensions
 
         private static void Refresh()
         {
+            // Do not allow it to be called in the same frame.
+            if (frameCount == Time.frameCount) return;
+            frameCount = Time.frameCount;
+
             Profiler.BeginSample("[UIParticle] Refresh");
             for (var i = 0; i < s_ActiveParticles.Count; i++)
             {
@@ -69,12 +74,12 @@ namespace Coffee.UIExtensions
             BakeMesh(particle);
             Profiler.EndSample();
 
-            if (QualitySettings.activeColorSpace == ColorSpace.Linear)
-            {
-                Profiler.BeginSample("[UIParticle] Modify color space to linear");
-                particle.bakedMesh.ModifyColorSpaceToLinear();
-                Profiler.EndSample();
-            }
+            // if (QualitySettings.activeColorSpace == ColorSpace.Linear)
+            // {
+            //     Profiler.BeginSample("[UIParticle] Modify color space to linear");
+            //     particle.bakedMesh.ModifyColorSpaceToLinear();
+            //     Profiler.EndSample();
+            // }
 
             Profiler.BeginSample("[UIParticle] Set mesh to CanvasRenderer");
             particle.canvasRenderer.SetMesh(particle.bakedMesh);
@@ -154,6 +159,9 @@ namespace Coffee.UIExtensions
 
             particle.cachedPosition = position;
 
+            if (particle.activeMeshIndices.CountFast() == 0)
+                diff = Vector3.zero;
+
             for (var i = 0; i < particle.particles.Count; i++)
             {
                 Profiler.BeginSample("[UIParticle] Bake Mesh > Push index");

Scripts/Utils.cs

@@ -65,22 +65,32 @@ namespace Coffee.UIParticleExtensions
 
             return false;
         }
+
+        public static bool AnyFast<T>(this List<T> self, Predicate<T> predicate) where T : Object
+        {
+            for (var i = 0; i < self.Count; ++i)
+            {
+                if (self[i] && predicate(self[i])) return true;
+            }
+
+            return false;
+        }
     }
 
     internal static class MeshExtensions
     {
-        static readonly List<Color32> s_Colors = new List<Color32>();
+        // static readonly List<Color32> s_Colors = new List<Color32>();
 
-        public static void ModifyColorSpaceToLinear(this Mesh self)
-        {
-            self.GetColors(s_Colors);
-
-            for (var i = 0; i < s_Colors.Count; i++)
-                s_Colors[i] = ((Color) s_Colors[i]).gamma;
-
-            self.SetColors(s_Colors);
-            s_Colors.Clear();
-        }
+        // public static void ModifyColorSpaceToLinear(this Mesh self)
+        // {
+        //     self.GetColors(s_Colors);
+        //
+        //     for (var i = 0; i < s_Colors.Count; i++)
+        //         s_Colors[i] = ((Color) s_Colors[i]).gamma;
+        //
+        //     self.SetColors(s_Colors);
+        //     s_Colors.Clear();
+        // }
 
         public static void Clear(this CombineInstance[] self)
         {
@@ -94,7 +104,8 @@ namespace Coffee.UIParticleExtensions
 
     internal static class MeshPool
     {
-        private static readonly Stack<Mesh> s_Pool = new Stack<Mesh>();
+        private static readonly Stack<Mesh> s_Pool = new Stack<Mesh>(32);
+        private static readonly HashSet<int> s_HashPool = new HashSet<int>();
 
         public static void Init()
         {
@@ -107,6 +118,7 @@ namespace Coffee.UIParticleExtensions
                 var m = new Mesh();
                 m.MarkDynamic();
                 s_Pool.Push(m);
+                s_HashPool.Add(m.GetInstanceID());
             }
         }
 
@@ -116,7 +128,11 @@ namespace Coffee.UIParticleExtensions
             while (0 < s_Pool.Count)
             {
                 m = s_Pool.Pop();
-                if (m) return m;
+                if (m)
+                {
+                    s_HashPool.Remove(m.GetInstanceID());
+                    return m;
+                }
             }
 
             m = new Mesh();
@@ -126,9 +142,14 @@ namespace Coffee.UIParticleExtensions
 
         public static void Return(Mesh mesh)
         {
-            if (!mesh || s_Pool.Contains(mesh)) return;
+            if (!mesh) return;
+
+            var id = mesh.GetInstanceID();
+            if (s_HashPool.Contains(id)) return;
+
             mesh.Clear(false);
             s_Pool.Push(mesh);
+            s_HashPool.Add(id);
         }
     }
 

package.json

@@ -2,7 +2,7 @@
   "name": "com.coffee.ui-particle",
   "displayName": "UI Particle",
   "description": "This plugin provide a component to render particle effect for uGUI.\nThe particle rendering is maskable and sortable, without Camera, RenderTexture or Canvas.",
-  "version": "3.3.3",
+  "version": "3.3.8",
   "unity": "2018.2",
   "license": "MIT",
   "repository": {