sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Normalize particle velocity based on max duration

Browse Source
This commit is contained in:
Opelkuh
2021-09-18 23:45:58 +02:00
parent 846cde53b3
commit ef530ed87c
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Gameplay/TestSceneParticleSpewer.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddToggleStep("toggle spawning", value => spewer.Active.Value = value); AddToggleStep("toggle spawning", value => spewer.Active.Value = value);
AddSliderStep("particle gravity", 0f, 1f, 0f, value => spewer.Gravity = value); AddSliderStep("particle gravity", 0f, 1f, 0f, value => spewer.Gravity = value);
AddSliderStep("particle velocity", 0f, 1f, 0.25f, value => spewer.MaxVelocity = value); AddSliderStep("particle velocity", 0f, 1f, 0.5f, value => spewer.MaxVelocity = value);
AddStep("move to new location", () => AddStep("move to new location", () =>
{ {
spewer.TransformTo(nameof(spewer.SpawnPosition), new Vector2(RNG.NextSingle(), RNG.NextSingle()), 1000, Easing.Out); spewer.TransformTo(nameof(spewer.SpawnPosition), new Vector2(RNG.NextSingle(), RNG.NextSingle()), 1000, Easing.Out);

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

@ -82,6 +82,8 @@ namespace osu.Game.Graphics
protected new ParticleSpewer Source => (ParticleSpewer)base.Source; protected new ParticleSpewer Source => (ParticleSpewer)base.Source;
private readonly float maxLifetime;
private float currentTime; private float currentTime;
private float gravity; private float gravity;
private Axes relativePositionAxes; private Axes relativePositionAxes;
@ -91,6 +93,7 @@ namespace osu.Game.Graphics
: base(source) : base(source)
{ {
particles = new FallingParticle[Source.particles.Length]; particles = new FallingParticle[Source.particles.Length];
maxLifetime = (float)Source.maxLifetime;
} }
public override void ApplyState() public override void ApplyState()
@ -121,7 +124,7 @@ namespace osu.Game.Graphics
var alpha = p.AlphaAtTime(timeSinceStart); var alpha = p.AlphaAtTime(timeSinceStart);
if (alpha <= 0) continue; if (alpha <= 0) continue;
var pos = p.PositionAtTime(timeSinceStart, gravity); var pos = p.PositionAtTime(timeSinceStart, gravity, maxLifetime);
var scale = p.ScaleAtTime(timeSinceStart); var scale = p.ScaleAtTime(timeSinceStart);
var angle = p.AngleAtTime(timeSinceStart); var angle = p.AngleAtTime(timeSinceStart);
@ -187,12 +190,12 @@ namespace osu.Game.Graphics
public float AngleAtTime(float timeSinceStart) => StartAngle + (EndAngle - StartAngle) * progressAtTime(timeSinceStart); public float AngleAtTime(float timeSinceStart) => StartAngle + (EndAngle - StartAngle) * progressAtTime(timeSinceStart);
public Vector2 PositionAtTime(float timeSinceStart, float gravity) public Vector2 PositionAtTime(float timeSinceStart, float gravity, float maxDuration)
{ {
var progress = progressAtTime(timeSinceStart); var progress = progressAtTime(timeSinceStart);
var currentGravity = new Vector2(0, gravity * Duration / 1000 * progress); var currentGravity = new Vector2(0, gravity * Duration / maxDuration * progress);
return StartPosition + (Velocity + currentGravity) * timeSinceStart / 1000; return StartPosition + (Velocity + currentGravity) * timeSinceStart / maxDuration;
} }
private float progressAtTime(float timeSinceStart) => Math.Clamp(timeSinceStart / Duration, 0, 1); private float progressAtTime(float timeSinceStart) => Math.Clamp(timeSinceStart / Duration, 0, 1);