From e60c43828eaee25eadc15f07ac0a01a7ec458d72 Mon Sep 17 00:00:00 2001 From: cody Date: Tue, 1 Mar 2022 21:24:14 +0100 Subject: [PATCH 1/3] add ability to configure layerdepth for autotriggered particleeffects --- src/cs/MonoGame.Extended.Particles/ParticleEmitter.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cs/MonoGame.Extended.Particles/ParticleEmitter.cs b/src/cs/MonoGame.Extended.Particles/ParticleEmitter.cs index a7116869..3b9aa874 100644 --- a/src/cs/MonoGame.Extended.Particles/ParticleEmitter.cs +++ b/src/cs/MonoGame.Extended.Particles/ParticleEmitter.cs @@ -53,6 +53,7 @@ namespace MonoGame.Extended.Particles public Vector2 Offset { get; set; } public List Modifiers { get; } public Profile Profile { get; set; } + public float LayerDepth { get; set; } public ParticleReleaseParameters Parameters { get; set; } public TextureRegion2D TextureRegion { get; set; } @@ -132,7 +133,7 @@ namespace MonoGame.Extended.Particles if (_nextAutoTrigger <= 0) { - Trigger(position); + Trigger(position, this.LayerDepth); _nextAutoTrigger = _autoTriggerFrequency; } } From 0fe16045e28dea0b26c325e5c9230626f60d8423 Mon Sep 17 00:00:00 2001 From: cody Date: Sat, 5 Mar 2022 18:18:38 +0100 Subject: [PATCH 2/3] added layerDepth to more Trigger overloads --- src/cs/MonoGame.Extended.Particles/ParticleEffect.cs | 6 +++--- src/cs/MonoGame.Extended.Particles/ParticleEmitter.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cs/MonoGame.Extended.Particles/ParticleEffect.cs b/src/cs/MonoGame.Extended.Particles/ParticleEffect.cs index fc15c79b..6850b568 100644 --- a/src/cs/MonoGame.Extended.Particles/ParticleEffect.cs +++ b/src/cs/MonoGame.Extended.Particles/ParticleEffect.cs @@ -74,10 +74,10 @@ namespace MonoGame.Extended.Particles Emitters[i].Trigger(position, layerDepth); } - public void Trigger(LineSegment line) + public void Trigger(LineSegment line, float layerDepth = 0) { for (var i = 0; i < Emitters.Count; i++) - Emitters[i].Trigger(line); + Emitters[i].Trigger(line, layerDepth); } public override string ToString() @@ -85,4 +85,4 @@ namespace MonoGame.Extended.Particles return Name; } } -} \ No newline at end of file +} diff --git a/src/cs/MonoGame.Extended.Particles/ParticleEmitter.cs b/src/cs/MonoGame.Extended.Particles/ParticleEmitter.cs index 3b9aa874..05ac2839 100644 --- a/src/cs/MonoGame.Extended.Particles/ParticleEmitter.cs +++ b/src/cs/MonoGame.Extended.Particles/ParticleEmitter.cs @@ -162,7 +162,7 @@ namespace MonoGame.Extended.Particles Release(position + Offset, numToRelease, layerDepth); } - public void Trigger(LineSegment line) + public void Trigger(LineSegment line, float layerDepth = 0) { var numToRelease = _random.Next(Parameters.Quantity); var lineVector = line.ToVector(); @@ -170,11 +170,11 @@ namespace MonoGame.Extended.Particles for (var i = 0; i < numToRelease; i++) { var offset = lineVector * _random.NextSingle(); - Release(line.Origin + offset, 1); + Release(line.Origin + offset, 1, layerDepth); } } - private void Release(Vector2 position, int numToRelease, float layerDepth = 0) + private void Release(Vector2 position, int numToRelease, float layerDepth) { var iterator = Buffer.Release(numToRelease); From 04a563680162debc217a0791374d76b898cac497 Mon Sep 17 00:00:00 2001 From: cody Date: Sat, 5 Mar 2022 18:28:08 +0100 Subject: [PATCH 3/3] remove unused ctor args --- src/cs/MonoGame.Extended.Particles/ParticleEffect.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cs/MonoGame.Extended.Particles/ParticleEffect.cs b/src/cs/MonoGame.Extended.Particles/ParticleEffect.cs index 6850b568..628980e0 100644 --- a/src/cs/MonoGame.Extended.Particles/ParticleEffect.cs +++ b/src/cs/MonoGame.Extended.Particles/ParticleEffect.cs @@ -11,7 +11,7 @@ namespace MonoGame.Extended.Particles { public class ParticleEffect : Transform2, IDisposable { - public ParticleEffect(string name = null, bool autoTrigger = true, float autoTriggerDelay = 0f) + public ParticleEffect(string name = null) { Name = name; Emitters = new List();