sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move cursor particles under OsuCursorContainer

Browse Source
This commit is contained in:
Opelkuh
2021-09-09 23:18:19 +02:00
parent c2f7b01ca4
commit 99eff4f41f
4 changed files with 53 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game/Graphics/Particles/ParticleSpewer.cs
View File

@ -26,22 +26,16 @@ namespace osu.Game.Graphics.Particles
/// </summary>
public readonly BindableBool Active = new BindableBool();
/// <summary>
/// <see cref="Drawable"/> whose DrawInfo will be used to draw each particle.
/// Defaults to the <see cref="ParticleSpewer"/> itself.
/// </summary>
public IDrawable ParticleParent;
public bool HasActiveParticles => Active.Value || (lastParticleAdded + maxLifetime) > Time.Current;
public override bool IsPresent => base.IsPresent && HasActiveParticles;
protected virtual bool CanSpawnParticles => true;
protected virtual float ParticleGravity => 0;
protected ParticleSpewer(Texture texture, int perSecond, double maxLifetime)
{
Texture = texture;
Blending = BlendingParameters.Additive;
ParticleParent = this;
particles = new FallingParticle[perSecond * (int)Math.Ceiling(maxLifetime / 1000)];
@ -57,9 +51,12 @@ namespace osu.Game.Graphics.Particles
// this can happen when seeking in replays.
if (lastParticleAdded > Time.Current) lastParticleAdded = 0;
if (Active.Value && Time.Current > lastParticleAdded + cooldown)
if (Active.Value && CanSpawnParticles && Time.Current > lastParticleAdded + cooldown)
{
addParticle(SpawnParticle());
particles[currentIndex] = SpawnParticle();
currentIndex = (currentIndex + 1) % particles.Length;
lastParticleAdded = Time.Current;
}
Invalidate(Invalidation.DrawNode);
@ -76,14 +73,6 @@ namespace osu.Game.Graphics.Particles
};
}
private void addParticle(FallingParticle fallingParticle)
{
particles[currentIndex] = fallingParticle;
currentIndex = (currentIndex + 1) % particles.Length;
lastParticleAdded = Time.Current;
}
protected override DrawNode CreateDrawNode() => new ParticleSpewerDrawNode(this);
# region DrawNode
@ -96,7 +85,6 @@ namespace osu.Game.Graphics.Particles
private float currentTime;
private float gravity;
private Matrix3 particleDrawMatrix;
public ParticleSpewerDrawNode(Sprite source)
: base(source)
@ -112,7 +100,6 @@ namespace osu.Game.Graphics.Particles
currentTime = (float)Source.Time.Current;
gravity = Source.ParticleGravity;
particleDrawMatrix = Source.ParticleParent.DrawInfo.Matrix;
}
protected override void Blit(Action<TexturedVertex2D> vertexAction)
@ -165,7 +152,7 @@ namespace osu.Game.Graphics.Particles
float x = centre.X + (pos.X - centre.X) * cos + (pos.Y - centre.Y) * sin;
float y = centre.Y + (pos.Y - centre.Y) * cos - (pos.X - centre.X) * sin;
return Vector2Extensions.Transform(new Vector2(x, y), particleDrawMatrix);
return Vector2Extensions.Transform(new Vector2(x, y), DrawInfo.Matrix);
}
}