h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 10:03:05 +08:00
Code Issues Releases Wiki Activity

Fix ParticleSpewer not correctly accounting for lower frame rates (and spawning less particles)

Browse Source
This commit is contained in:
Dean Herbert 2023-07-18 19:52:45 +09:00
parent f4acc86df8
commit ccbb30cdda
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Graphics/ParticleSpewer.cs
View File

@ -20,9 +20,9 @@ namespace osu.Game.Graphics
{ {
private readonly FallingParticle[] particles; private readonly FallingParticle[] particles;
private int currentIndex; private int currentIndex;
private double lastParticleAdded; private double? lastParticleAdded;
private readonly double cooldown; private readonly double timeBetweenSpawns;
private readonly double maxDuration; private readonly double maxDuration;
/// <summary> /// <summary>
@ -44,7 +44,7 @@ namespace osu.Game.Graphics
particles = new FallingParticle[perSecond * (int)Math.Ceiling(maxDuration / 1000)]; particles = new FallingParticle[perSecond * (int)Math.Ceiling(maxDuration / 1000)];
cooldown = 1000f / perSecond; timeBetweenSpawns = 1000f / perSecond;
this.maxDuration = maxDuration; this.maxDuration = maxDuration;
} }
@ -52,18 +52,27 @@ namespace osu.Game.Graphics
{ {
base.Update(); base.Update();
if (Active.Value && CanSpawnParticles && Math.Abs(Time.Current - lastParticleAdded) > cooldown) Invalidate(Invalidation.DrawNode);
if (!Active.Value || !CanSpawnParticles)
{ {
lastParticleAdded = null;
return;
}
while (lastParticleAdded == null || Math.Abs(Time.Current - lastParticleAdded.Value) > timeBetweenSpawns)
{
lastParticleAdded ??= Time.Current;
var newParticle = CreateParticle(); var newParticle = CreateParticle();
newParticle.StartTime = (float)Time.Current; newParticle.StartTime = (float)lastParticleAdded;
particles[currentIndex] = newParticle; particles[currentIndex] = newParticle;
currentIndex = (currentIndex + 1) % particles.Length; currentIndex = (currentIndex + 1) % particles.Length;
lastParticleAdded = Time.Current;
}
Invalidate(Invalidation.DrawNode); lastParticleAdded += timeBetweenSpawns;
}
} }
/// <summary> /// <summary>