h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:52:53 +08:00
Code Issues Releases Wiki Activity

Refactor OsuAutoGenerator to allow custom SPM specifications

Browse Source
This commit is contained in:
Dean Herbert 2023-11-17 16:44:11 +09:00
parent dee6a79911
commit a1673160f1
No known key found for this signature in database
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
View File

@ -339,6 +339,10 @@ namespace osu.Game.Rulesets.Osu.Replays
AddFrameToReplay(startFrame); AddFrameToReplay(startFrame);
// ~477 as per stable.
const float spin_rpm = 60000f / 20 * (180 / MathF.PI) / 360;
float radsPerMillisecond = MathUtils.DegreesToRadians(spin_rpm * 360) / 60000;
switch (h) switch (h)
{ {
// We add intermediate frames for spinning / following a slider here. // We add intermediate frames for spinning / following a slider here.
@ -354,7 +358,7 @@ namespace osu.Game.Rulesets.Osu.Replays
for (double nextFrame = h.StartTime + GetFrameDelay(h.StartTime); nextFrame < spinner.EndTime; nextFrame += GetFrameDelay(nextFrame)) for (double nextFrame = h.StartTime + GetFrameDelay(h.StartTime); nextFrame < spinner.EndTime; nextFrame += GetFrameDelay(nextFrame))
{ {
t = ApplyModsToTimeDelta(previousFrame, nextFrame) * spinnerDirection; t = ApplyModsToTimeDelta(previousFrame, nextFrame) * spinnerDirection;
angle += (float)t / 20; angle += (float)t * radsPerMillisecond;
Vector2 pos = SPINNER_CENTRE + CirclePosition(angle, SPIN_RADIUS); Vector2 pos = SPINNER_CENTRE + CirclePosition(angle, SPIN_RADIUS);
AddFrameToReplay(new OsuReplayFrame((int)nextFrame, new Vector2(pos.X, pos.Y), action)); AddFrameToReplay(new OsuReplayFrame((int)nextFrame, new Vector2(pos.X, pos.Y), action));
@ -363,7 +367,7 @@ namespace osu.Game.Rulesets.Osu.Replays
} }
t = ApplyModsToTimeDelta(previousFrame, spinner.EndTime) * spinnerDirection; t = ApplyModsToTimeDelta(previousFrame, spinner.EndTime) * spinnerDirection;
angle += (float)t / 20; angle += (float)t * radsPerMillisecond;
Vector2 endPosition = SPINNER_CENTRE + CirclePosition(angle, SPIN_RADIUS); Vector2 endPosition = SPINNER_CENTRE + CirclePosition(angle, SPIN_RADIUS);