You've already forked ParticleEffectForUGUI
mirror of
https://github.com/mob-sakai/ParticleEffectForUGUI.git
synced 2026-05-15 12:40:08 +00:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4f9bbf57bc | ||
|
|
0b9d80da93 | ||
|
|
24d32d8441 | ||
|
|
476c4027ff | ||
|
|
12c748a8cd | ||
|
|
0259ad2464 | ||
|
|
5f3ead2086 | ||
|
|
e3f42d747a | ||
|
|
b93e0e4701 |
23
CHANGELOG.md
23
CHANGELOG.md
@@ -1,3 +1,26 @@
|
|||||||
|
## [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)
|
## [3.3.4](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/3.3.3...3.3.4) (2021-02-22)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace Coffee.UIParticleExtensions
|
namespace Coffee.UIParticleExtensions
|
||||||
{
|
{
|
||||||
|
[AddComponentMenu("")]
|
||||||
internal class BakingCamera : MonoBehaviour
|
internal class BakingCamera : MonoBehaviour
|
||||||
{
|
{
|
||||||
static BakingCamera s_Instance;
|
static BakingCamera s_Instance;
|
||||||
@@ -40,12 +41,11 @@ namespace Coffee.UIParticleExtensions
|
|||||||
// Find instance in scene, or create new one.
|
// Find instance in scene, or create new one.
|
||||||
return s_Instance
|
return s_Instance
|
||||||
? s_Instance
|
? s_Instance
|
||||||
: (s_Instance = FindObjectOfType<BakingCamera>() ?? Create());
|
: (s_Instance = Create());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Camera _camera;
|
private Camera _camera;
|
||||||
// private int _refCount;
|
|
||||||
|
|
||||||
private static BakingCamera Create()
|
private static BakingCamera Create()
|
||||||
{
|
{
|
||||||
@@ -56,6 +56,7 @@ namespace Coffee.UIParticleExtensions
|
|||||||
|
|
||||||
var inst = gameObject.AddComponent<BakingCamera>();
|
var inst = gameObject.AddComponent<BakingCamera>();
|
||||||
inst._camera = gameObject.AddComponent<Camera>();
|
inst._camera = gameObject.AddComponent<Camera>();
|
||||||
|
inst._camera.enabled = false;
|
||||||
inst._camera.orthographic = true;
|
inst._camera.orthographic = true;
|
||||||
|
|
||||||
// Turn camera off because particle mesh baker will use only camera matrix
|
// Turn camera off because particle mesh baker will use only camera matrix
|
||||||
|
|||||||
@@ -178,6 +178,11 @@ namespace Coffee.UIExtensions
|
|||||||
particles.Exec(p => p.Stop());
|
particles.Exec(p => p.Stop());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Clear()
|
||||||
|
{
|
||||||
|
particles.Exec(p => p.Clear());
|
||||||
|
}
|
||||||
|
|
||||||
public void SetParticleSystemInstance(GameObject instance)
|
public void SetParticleSystemInstance(GameObject instance)
|
||||||
{
|
{
|
||||||
SetParticleSystemInstance(instance, true);
|
SetParticleSystemInstance(instance, true);
|
||||||
@@ -390,7 +395,6 @@ namespace Coffee.UIExtensions
|
|||||||
#if !SERIALIZE_FIELD_MASKABLE
|
#if !SERIALIZE_FIELD_MASKABLE
|
||||||
maskable = m_Maskable;
|
maskable = m_Maskable;
|
||||||
#endif
|
#endif
|
||||||
_cachedPosition = transform.position;
|
|
||||||
activeMeshIndices.Clear();
|
activeMeshIndices.Clear();
|
||||||
|
|
||||||
UIParticleUpdater.Register(this);
|
UIParticleUpdater.Register(this);
|
||||||
@@ -411,17 +415,20 @@ namespace Coffee.UIExtensions
|
|||||||
|
|
||||||
private new IEnumerator Start()
|
private new IEnumerator Start()
|
||||||
{
|
{
|
||||||
|
// #147: ParticleSystem creates Particles in wrong position during prewarm
|
||||||
// #148: Particle Sub Emitter not showing when start game
|
// #148: Particle Sub Emitter not showing when start game
|
||||||
var hasPlayingSubEmitter = particles.AnyFast(ps =>
|
var delayToPlay = particles.AnyFast(ps =>
|
||||||
{
|
{
|
||||||
ps.GetComponentsInChildren(false, s_ParticleSystems);
|
ps.GetComponentsInChildren(false, s_ParticleSystems);
|
||||||
return s_ParticleSystems.AnyFast(p => p.isPlaying && p.subEmitters.enabled);
|
return s_ParticleSystems.AnyFast(p => p.isPlaying && (p.subEmitters.enabled || p.main.prewarm));
|
||||||
});
|
});
|
||||||
s_ParticleSystems.Clear();
|
s_ParticleSystems.Clear();
|
||||||
if (!hasPlayingSubEmitter) yield break;
|
if (!delayToPlay) yield break;
|
||||||
|
|
||||||
Stop();
|
Stop();
|
||||||
|
Clear();
|
||||||
yield return null;
|
yield return null;
|
||||||
|
|
||||||
Play();
|
Play();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ namespace Coffee.UIExtensions
|
|||||||
static readonly List<UIParticle> s_ActiveParticles = new List<UIParticle>();
|
static readonly List<UIParticle> s_ActiveParticles = new List<UIParticle>();
|
||||||
static MaterialPropertyBlock s_Mpb;
|
static MaterialPropertyBlock s_Mpb;
|
||||||
static ParticleSystem.Particle[] s_Particles = new ParticleSystem.Particle[2048];
|
static ParticleSystem.Particle[] s_Particles = new ParticleSystem.Particle[2048];
|
||||||
|
private static int frameCount = 0;
|
||||||
|
|
||||||
|
|
||||||
public static void Register(UIParticle particle)
|
public static void Register(UIParticle particle)
|
||||||
@@ -41,6 +42,10 @@ namespace Coffee.UIExtensions
|
|||||||
|
|
||||||
private static void Refresh()
|
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");
|
Profiler.BeginSample("[UIParticle] Refresh");
|
||||||
for (var i = 0; i < s_ActiveParticles.Count; i++)
|
for (var i = 0; i < s_ActiveParticles.Count; i++)
|
||||||
{
|
{
|
||||||
@@ -154,6 +159,9 @@ namespace Coffee.UIExtensions
|
|||||||
|
|
||||||
particle.cachedPosition = position;
|
particle.cachedPosition = position;
|
||||||
|
|
||||||
|
if (particle.activeMeshIndices.CountFast() == 0)
|
||||||
|
diff = Vector3.zero;
|
||||||
|
|
||||||
for (var i = 0; i < particle.particles.Count; i++)
|
for (var i = 0; i < particle.particles.Count; i++)
|
||||||
{
|
{
|
||||||
Profiler.BeginSample("[UIParticle] Bake Mesh > Push index");
|
Profiler.BeginSample("[UIParticle] Bake Mesh > Push index");
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"name": "com.coffee.ui-particle",
|
"name": "com.coffee.ui-particle",
|
||||||
"displayName": "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.",
|
"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.4",
|
"version": "3.3.7",
|
||||||
"unity": "2018.2",
|
"unity": "2018.2",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|||||||
Reference in New Issue
Block a user