sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 09:57:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

Simplify application logic

Browse Source
This commit is contained in:
Dean Herbert 2021-05-24 14:33:07 +09:00
parent a92ded8a2f
commit 53b5341bb9
1 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
View File

@ -83,36 +83,24 @@ namespace osu.Game.Rulesets.Osu.Mods
var distanceToPrev = Vector2.Distance(prevObjectInfo.EndPositionOriginal, currentObjectInfo.PositionOriginal); var distanceToPrev = Vector2.Distance(prevObjectInfo.EndPositionOriginal, currentObjectInfo.PositionOriginal);
if (hitObject is Spinner)
continue;
applyRandomisation(
rateOfChangeMultiplier,
prevObjectInfo,
distanceToPrev,
ref currentObjectInfo
);
hitObject.Position = currentObjectInfo.PositionRandomised;
// update end position as it may have changed as a result of the position update.
currentObjectInfo.EndPositionRandomised = currentObjectInfo.PositionRandomised;
switch (hitObject) switch (hitObject)
{ {
case HitCircle circle:
applyRandomisation(
rateOfChangeMultiplier,
prevObjectInfo,
distanceToPrev,
ref currentObjectInfo
);
circle.Position = currentObjectInfo.PositionRandomised;
currentObjectInfo.EndPositionRandomised = currentObjectInfo.PositionRandomised;
break;
case Slider slider: case Slider slider:
currentObjectInfo.EndPositionOriginal = slider.EndPosition;
currentObjectInfo.EndPositionOriginal = slider.TailCircle.Position;
applyRandomisation(
rateOfChangeMultiplier,
prevObjectInfo,
distanceToPrev,
ref currentObjectInfo
);
slider.Position = currentObjectInfo.PositionRandomised;
currentObjectInfo.EndPositionRandomised = slider.TailCircle.Position;
moveSliderIntoPlayfield(ref slider, ref currentObjectInfo); moveSliderIntoPlayfield(ref slider, ref currentObjectInfo);
var sliderShift = Vector2.Subtract(slider.Position, currentObjectInfo.PositionOriginal); var sliderShift = Vector2.Subtract(slider.Position, currentObjectInfo.PositionOriginal);
@ -239,15 +227,9 @@ namespace osu.Game.Rulesets.Osu.Mods
var diff = destAngleRad - initialAngleRad; var diff = destAngleRad - initialAngleRad;
while (diff < -Math.PI) while (diff < -Math.PI) diff += 2 * Math.PI;
{
diff += 2 * Math.PI;
}
while (diff > Math.PI) while (diff > Math.PI) diff -= 2 * Math.PI;
{
diff -= 2 * Math.PI;
}
var finalAngleRad = initialAngleRad + relativeDistance * diff; var finalAngleRad = initialAngleRad + relativeDistance * diff;