From c6b25c73bf415688bca6e58dd82eecf52389fa32 Mon Sep 17 00:00:00 2001 From: mob-sakai Date: Tue, 23 Jan 2024 19:55:30 +0900 Subject: [PATCH] refactor: (remove code) sub emitters option is not work in editor playing --- Packages/src/Scripts/UIParticle.cs | 10 -------- Packages/src/Scripts/UIParticleRenderer.cs | 28 ---------------------- Packages/src/Scripts/UIParticleUpdater.cs | 9 ------- 3 files changed, 47 deletions(-) diff --git a/Packages/src/Scripts/UIParticle.cs b/Packages/src/Scripts/UIParticle.cs index f8638ae..0d21be5 100644 --- a/Packages/src/Scripts/UIParticle.cs +++ b/Packages/src/Scripts/UIParticle.cs @@ -565,16 +565,6 @@ namespace Coffee.UIExtensions } } - internal void UpdateParticleCount() - { - for (var i = 0; i < _renderers.Count; i++) - { - var r = _renderers[i]; - if (!r) continue; - r.UpdateParticleCount(); - } - } - internal void ResetGroupId() { _groupId = m_GroupId == m_GroupMaxId diff --git a/Packages/src/Scripts/UIParticleRenderer.cs b/Packages/src/Scripts/UIParticleRenderer.cs index 0f213d4..97f6ca9 100644 --- a/Packages/src/Scripts/UIParticleRenderer.cs +++ b/Packages/src/Scripts/UIParticleRenderer.cs @@ -36,7 +36,6 @@ namespace Coffee.UIExtensions private Material _modifiedMaterial; private UIParticle _parent; private ParticleSystem _particleSystem; - private int _prevParticleCount; private Vector3 _prevPsPos; private Vector3 _prevScale; private Vector2Int _prevScreenSize; @@ -108,7 +107,6 @@ namespace Coffee.UIExtensions _parent = null; _particleSystem = null; _renderer = null; - _prevParticleCount = 0; if (0 <= index) { _index = index; @@ -262,7 +260,6 @@ namespace Coffee.UIExtensions _prevScreenSize = new Vector2Int(Screen.width, Screen.height); _prevCanvasScale = canvas ? canvas.scaleFactor : 1f; _delay = true; - _prevParticleCount = 0; canvasRenderer.SetTexture(null); @@ -496,12 +493,6 @@ namespace Coffee.UIExtensions s_Renderers.Clear(); } - internal void UpdateParticleCount() - { - if (!_particleSystem) return; - _prevParticleCount = _particleSystem.particleCount; - } - /// /// Call to update the geometry of the Graphic onto the CanvasRenderer. /// @@ -628,25 +619,6 @@ namespace Coffee.UIExtensions _prewarm = false; } - // (COMMENT OUT) #231: Sub Emitters option is not work in editor playing - /* - // Emitted particles found. - if (_prevParticleCount != _particleSystem.particleCount) - { - var size = _particleSystem.particleCount; - var particles = ParticleSystemExtensions.GetParticleArray(size); - _particleSystem.GetParticles(particles, size); - for (var i = _prevParticleCount; i < size; i++) - { - var p = particles[i]; - p.position = p.position.GetScaled(scale.Inverse()); - particles[i] = p; - } - - _particleSystem.SetParticles(particles, size); - } - */ - // get world position. var isLocalSpace = _particleSystem.IsLocalSpace(); var psTransform = _particleSystem.transform; diff --git a/Packages/src/Scripts/UIParticleUpdater.cs b/Packages/src/Scripts/UIParticleUpdater.cs index 7a191f0..63b251d 100644 --- a/Packages/src/Scripts/UIParticleUpdater.cs +++ b/Packages/src/Scripts/UIParticleUpdater.cs @@ -93,15 +93,6 @@ namespace Coffee.UIExtensions { s_ActiveAttractors[i].Attract(); } - - // UpdateParticleCount. - for (var i = 0; i < s_ActiveParticles.Count; i++) - { - var uip = s_ActiveParticles[i]; - if (!uip || !uip.canvas) continue; - - uip.UpdateParticleCount(); - } } public static void GetGroupedRenderers(int groupId, int index, List results)