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

Apply renaming and general code clean-up

Browse Source
This commit is contained in:
Dean Herbert
2021-05-24 14:28:07 +09:00
parent 88d7bc195d
commit a92ded8a2f
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@ namespace osu.Game.Rulesets.Osu.Mods
switch (hitObject)
{
case HitCircle circle:
getObjectInfo(
applyRandomisation(
rateOfChangeMultiplier,
prevObjectInfo,
distanceToPrev,
@ -103,7 +103,7 @@ namespace osu.Game.Rulesets.Osu.Mods
currentObjectInfo.EndPositionOriginal = slider.TailCircle.Position;
getObjectInfo(
applyRandomisation(
rateOfChangeMultiplier,
prevObjectInfo,
distanceToPrev,
@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Osu.Mods
/// Returns the final position of the hit object
/// </summary>
/// <returns>Final position of the hit object</returns>
private void getObjectInfo(float rateOfChangeMultiplier, RandomObjectInfo prevObjectInfo, float distanceToPrev, ref RandomObjectInfo currentObjectInfo)
private void applyRandomisation(float rateOfChangeMultiplier, RandomObjectInfo prevObjectInfo, float distanceToPrev, ref RandomObjectInfo currentObjectInfo)
{
// The max. angle (relative to the angle of the vector pointing from the 2nd last to the last hit object)
// is proportional to the distance between the last and the current hit object
@ -155,15 +155,8 @@ namespace osu.Game.Rulesets.Osu.Mods
// Move hit objects back into the playfield if they are outside of it,
// which would sometimes happen during big jumps otherwise.
if (position.X < 0)
position.X = 0;
else if (position.X > OsuPlayfield.BASE_SIZE.X)
position.X = OsuPlayfield.BASE_SIZE.X;
if (position.Y < 0)
position.Y = 0;
else if (position.Y > OsuPlayfield.BASE_SIZE.Y)
position.Y = OsuPlayfield.BASE_SIZE.Y;
position.X = MathHelper.Clamp(position.X, 0, OsuPlayfield.BASE_SIZE.X);
position.Y = MathHelper.Clamp(position.Y, 0, OsuPlayfield.BASE_SIZE.Y);
currentObjectInfo.PositionRandomised = position;
}