chore(release): 3.3.7 [skip ci]

## [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](0b9d80da93))

.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: |
+      - uses: cycjimmy/semantic-release-action@v2
-          npm i --no-save https://gist.github.com/mob-sakai/c90044338361af97a7e8c8a78425bdb3
+        with:
-          npx semantic-release -e @mob-sakai/semantic-release-upm
+          extra_plugins: |
+            @semantic-release/changelog
+            @semantic-release/git
         env:
           GITHUB_TOKEN: ${{ github.token }}

.github/workflows/test.yml

@@ -0,0 +1,94 @@
+# Secrets
+#   UNITY_LICENSE:
+name: test
+
+on:
+  push:
+    branches:
+      - develop
+    tags:
+      - "!*"
+  pull_request:
+    types:
+      - opened
+      - synchronize
+
+jobs:
+  unity-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        unityVersion: [
+            "2018.3.14f1",
+            "2018.4.30f1",
+            "2019.1.14f1",
+            "2019.2.21f1",
+            "2019.3.15f1",
+            "2019.4.16f1",
+            "2020.1.17f1",
+            "2020.2.1f1",
+          ]
+
+    steps:
+      # Checkout sandbox project
+      - uses: actions/checkout@v2
+        with:
+          ref: sandbox
+          submodules: true
+          fetch-depth: 0
+
+      # Update package submodule
+      - name: "Update package submodule"
+        working-directory: Packages/dev
+        run: git checkout ${{ github.sha }}
+
+      - uses: actions/cache@v2
+        with:
+          path: Library
+          key: Library-${{ matrix.unityVersion }}-${{ github.sha }}
+          restore-keys: |
+            Library-${{ matrix.unityVersion }}-
+            Library-
+
+      # Install codecoverage package
+      - name: "Install codecoverage package"
+        if: startsWith(matrix.unityVersion, '2019.4.')
+        run: |
+          npx openupm-cli add -f com.unity.testtools.codecoverage@0.4.0-preview
+
+      # Run tests
+      - name: "Run tests"
+        uses: game-ci/unity-test-runner@main
+        with:
+          unityVersion: ${{ matrix.unityVersion }}
+          customParameters: -nographics -enableCodeCoverage -coverageOptions assemblyFilters:+Coffee.UIParticle.*Tests
+        env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+
+      - uses: actions/upload-artifact@v2
+        if: always()
+        with:
+          name: TestResults-${{ matrix.unityVersion }}
+          path: |
+            artifacts/*.xml
+            CodeCoverage/**/TestCoverageResults_*.xml
+
+  publish:
+    needs: unity-test
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      
+      - uses: actions/download-artifact@v2
+        with:
+          path: artifacts
+      
+      - uses: testspace-com/setup-testspace@v1
+        with:
+          domain: ${{github.repository_owner}}
+
+      - name: Push test results
+        if: always()
+        run: |
+          testspace `find . -name '*.xml' | tr '\n' ' '`

.github/workflows/unity-test.yml

@@ -1,100 +0,0 @@
-name: unity-test
-
-on:
-  push:
-    branches:
-      - develop
-    tags:
-      - "!*"
-  pull_request:
-    types:
-      - opened
-      - synchronize
-
-jobs:
-  unity-test:
-    strategy:
-      fail-fast: false
-      matrix:
-        unity:
-          [
-            "2018.3.14f1",
-            "2018.4.25f1",
-            "2019.1.14f1",
-            "2019.2.11f1",
-            "2019.3.15f1",
-            "2019.4.8f1",
-            "2020.1.5f1",
-          ]
-
-    runs-on: ubuntu-latest
-    container:
-      # Use Unity image from https://hub.docker.com/r/gableroux/unity3d/tags
-      image: gableroux/unity3d:${{ matrix.unity }}
-
-    steps:
-      # Activate Unity Editor
-      - name: Activate Unity Editor
-        id: activation
-        run: |
-          apt-get update > /dev/null
-          apt-get install software-properties-common -y > /dev/null
-          apt-add-repository ppa:git-core/ppa -y > /dev/null
-          apt-get update > /dev/null
-          apt-get install git -y > /dev/null
-          git clone https://gist.github.com/135c940b45ec4e385861c8711777db7f.git .ulfs
-          chmod 755 .ulfs/activate.sh && .ulfs/activate.sh ${{ matrix.unity }}
-
-      # (On failed activation) Upload unity activation file
-      - name: Upload unity activation file
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: Unity_v${{ matrix.unity }}.alf
-          path: ./*.alf
-
-      # Checkout sandbox project
-      - uses: actions/checkout@v2
-        with:
-          ref: "sandbox"
-          submodules: "true"
-
-      # Update package submodule
-      - name: "Update package submodule"
-        working-directory: Packages/dev
-        run: git checkout ${{ github.head_ref }}
-
-      # Install codecoverage package
-      - name: "Install codecoverage package"
-        if: always() && steps.activation.conclusion == 'success'
-        run: |
-          [ -n "`echo ${{ matrix.unity }} | grep -e '\(2017.\|2018.\|2019.1.\|2019.2.\)'`" ] && exit 0
-          npm i -g openupm-cli
-          openupm add com.unity.testtools.codecoverage
-
-      # Run playmode tests
-      - name: "Run playmode tests"
-        if: always() && steps.activation.conclusion == 'success'
-        run: |
-          xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
-            /opt/Unity/Editor/Unity -batchmode -nographics -silent-crashes -logFile -projectPath . \
-            -runTests -testPlatform playmode -enableCodeCoverage
-
-      # Run editmode tests
-      - name: "Run editmode tests"
-        if: always() && steps.activation.conclusion == 'success'
-        run: |
-          xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
-            /opt/Unity/Editor/Unity -batchmode -nographics -silent-crashes -logFile -projectPath . \
-            -runTests -testPlatform editmode -enableCodeCoverage
-
-      # Setup testspace
-      - uses: testspace-com/setup-testspace@v1
-        if: always() && steps.activation.conclusion == 'success'
-        with:
-          domain: ${{ github.repository_owner }}
-
-      # Push test results
-      - name: Push test results
-        if: always() && steps.activation.conclusion == 'success'
-        run: testspace "[${{ matrix.unity }}]TestResults-*.xml" "[Code Coverage]CodeCoverage/**/TestCoverageResults_*.xml"

.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,58 @@
+## [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)
+
+
+### Bug Fixes
+
+* particle trails draw in wrong transform ([17ce81e](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/17ce81eb0eccb103c21fa553183df97429cf5c6f)), closes [#145](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/145)
+
+## [3.3.2](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.3.1...3.3.2) (2021-02-01)
+
+
+### Bug Fixes
+
+* _cachedPosition defaults to localPosition ([c0aa89b](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/c0aa89bd6f7847723a4702b6ca70fa202e8a8304)), closes [#121](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/121)
+* submeshes can't over 8 ([2a1f334](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/2a1f3345bacdecf38e8890781a181a1392224e35)), closes [#122](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/122)
+
+## [3.3.1](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.3.0...3.3.1) (2021-02-01)
+
+
+### Bug Fixes
+
+* ignore material check and transform check ([d11cd0a](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/d11cd0a06d76a32b2a119387bddc34c703b9b497)), closes [#119](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/119)
+* the trail is incorrect in SimulationSpace.Local ([9313489](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/9313489552b30f2e2b0b42a641f5e0502995b03d))
+
 # [3.3.0](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.2.0...3.3.0) (2020-11-20)
 
 

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

@@ -204,19 +204,6 @@ namespace Coffee.UIExtensions
                 DestroyUIParticle(current);
                 return;
             }
-
-            current.GetComponentsInParent(true, s_TempParents);
-            if (FixButton(1 < s_TempParents.Count, "This UIParticle component should be removed. The parent UIParticle exists."))
-            {
-                DestroyUIParticle(current);
-                return;
-            }
-
-            current.GetComponentsInChildren(true, s_TempChildren);
-            if (FixButton(1 < s_TempChildren.Count, "The children UIParticle component should be removed."))
-            {
-                s_TempChildren.ForEach(child => DestroyUIParticle(child, true));
-            }
         }
 
         void DestroyUIParticle(UIParticle p, bool ignoreCurrent = false)
@@ -263,20 +250,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);
@@ -222,6 +229,7 @@ namespace Coffee.UIExtensions
         {
             if (!root) return;
             root.GetComponentsInChildren(particles);
+            particles.RemoveAll(x => x.GetComponentInParent<UIParticle>() != this);
 
             foreach (var ps in particles)
             {
@@ -265,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++)
@@ -387,7 +395,6 @@ namespace Coffee.UIExtensions
 #if !SERIALIZE_FIELD_MASKABLE
             maskable = m_Maskable;
 #endif
-            _cachedPosition = transform.localPosition;
             activeMeshIndices.Clear();
 
             UIParticleUpdater.Register(this);
@@ -406,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>
@@ -447,14 +473,6 @@ namespace Coffee.UIExtensions
                 enabled = false;
                 return;
             }
-            else if (enabled && transform.parent && transform.parent.GetComponentInParent<UIParticle>())
-            {
-                UnityEngine.Debug.LogWarningFormat(this, "[UIParticle] The UIParticle component should be removed: {0}\nReason: The parent UIParticle exists.", name);
-                gameObject.hideFlags = HideFlags.None;
-                _shouldBeRemoved = true;
-                enabled = false;
-                return;
-            }
 
             if (!this || particles.AnyFast()) return;
 

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++)
             {
@@ -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");
@@ -241,6 +249,10 @@ namespace Coffee.UIExtensions
                     var hash = currentPs.GetMaterialHash(true);
                     if (hash != 0)
                     {
+                        matrix = currentPs.main.simulationSpace == ParticleSystemSimulationSpace.Local && currentPs.trails.worldSpace
+                            ? matrix * Matrix4x4.Translate(-currentPs.transform.position)
+                            : matrix;
+
                         var m = MeshHelper.GetTemporaryMesh();
                         try
                         {

Scripts/Utils.cs

@@ -9,8 +9,9 @@ namespace Coffee.UIParticleExtensions
     internal static class SpriteExtensions
     {
 #if UNITY_EDITOR
-        private static Type tSpriteEditorExtension = Type.GetType("UnityEditor.Experimental.U2D.SpriteEditorExtension, UnityEditor")
+        private static Type tSpriteEditorExtension =
-                                                     ?? Type.GetType("UnityEditor.U2D.SpriteEditorExtension, UnityEditor");
+            Type.GetType("UnityEditor.Experimental.U2D.SpriteEditorExtension, UnityEditor")
+            ?? Type.GetType("UnityEditor.U2D.SpriteEditorExtension, UnityEditor");
 
         private static MethodInfo miGetActiveAtlasTexture = tSpriteEditorExtension
             .GetMethod("GetActiveAtlasTexture", BindingFlags.Static | BindingFlags.NonPublic);
@@ -64,6 +65,16 @@ 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
@@ -222,27 +233,18 @@ namespace Coffee.UIParticleExtensions
                 if (!Mathf.Approximately(aPos, bPos))
                     return (int) Mathf.Sign(bPos - aPos);
 
-                // Material instance ID: match
+                return (int) Mathf.Sign(GetIndex(self, a) - GetIndex(self, b));
-                if (aMat.GetInstanceID() == bMat.GetInstanceID())
-                    return 0;
-
-                // Transform: ascending
-                return TransformCompare(aTransform, bTransform);
             });
         }
 
-        private static int TransformCompare(Transform a, Transform b)
+        private static int GetIndex(IList<ParticleSystem> list, Object ps)
         {
-            while (true)
+            for (var i = 0; i < list.Count; i++)
             {
-                if (!a && !b) return 0;
+                if (list[i].GetInstanceID() == ps.GetInstanceID()) return i;
-                if (!a) return -1;
-                if (!b) return 1;
-                if (a.parent == b.parent) return a.GetSiblingIndex() - b.GetSiblingIndex();
-
-                a = a.parent;
-                b = b.parent;
             }
+
+            return 0;
         }
 
         public static long GetMaterialHash(this ParticleSystem self, bool trail)

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.0",
+  "version": "3.3.7",
   "unity": "2018.2",
   "license": "MIT",
   "repository": {