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

Rename Distance to DistanceFromPrevious

Browse Source
This commit is contained in:
Henry Lin 2022-03-09 13:09:33 +08:00
parent ae1c65c38d
commit 3ced5e7904
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,19 +73,19 @@ namespace osu.Game.Rulesets.Osu.Mods
if (previous == null) if (previous == null)
{ {
current.Distance = (float)(rng.NextDouble() * OsuPlayfield.BASE_SIZE.X / 2); current.DistanceFromPrevious = (float)(rng.NextDouble() * OsuPlayfield.BASE_SIZE.X / 2);
current.RelativeAngle = (float)(rng.NextDouble() * 2 * Math.PI - Math.PI); current.RelativeAngle = (float)(rng.NextDouble() * 2 * Math.PI - Math.PI);
} }
else else
{ {
current.Distance = Vector2.Distance(previous.EndPositionOriginal, current.PositionOriginal); current.DistanceFromPrevious = Vector2.Distance(previous.EndPositionOriginal, current.PositionOriginal);
// The max. angle (relative to the angle of the vector pointing from the 2nd last to the last hit object) // 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 // is proportional to the distance between the last and the current hit object
// to allow jumps and prevent too sharp turns during streams. // to allow jumps and prevent too sharp turns during streams.
// Allow maximum jump angle when jump distance is more than half of playfield diagonal length // Allow maximum jump angle when jump distance is more than half of playfield diagonal length
current.RelativeAngle = rateOfChangeMultiplier * 2 * (float)Math.PI * Math.Min(1f, current.Distance / (playfield_diagonal * 0.5f)); current.RelativeAngle = rateOfChangeMultiplier * 2 * (float)Math.PI * Math.Min(1f, current.DistanceFromPrevious / (playfield_diagonal * 0.5f));
} }
previous = current; previous = current;
@ -177,8 +177,8 @@ namespace osu.Game.Rulesets.Osu.Mods
float absoluteAngle = previousAbsoluteAngle + current.RelativeAngle; float absoluteAngle = previousAbsoluteAngle + current.RelativeAngle;
var posRelativeToPrev = new Vector2( var posRelativeToPrev = new Vector2(
current.Distance * (float)Math.Cos(absoluteAngle), current.DistanceFromPrevious * (float)Math.Cos(absoluteAngle),
current.Distance * (float)Math.Sin(absoluteAngle) current.DistanceFromPrevious * (float)Math.Sin(absoluteAngle)
); );
Vector2 lastEndPosition = previous?.EndPositionRandomised ?? playfield_centre; Vector2 lastEndPosition = previous?.EndPositionRandomised ?? playfield_centre;
@ -349,9 +349,9 @@ namespace osu.Game.Rulesets.Osu.Mods
/// The jump distance from the previous hit object to this one. /// The jump distance from the previous hit object to this one.
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// <see cref="Distance"/> of the first hit object in a beatmap is relative to the playfield center. /// <see cref="DistanceFromPrevious"/> of the first hit object in a beatmap is relative to the playfield center.
/// </remarks> /// </remarks>
public float Distance { get; set; } public float DistanceFromPrevious { get; set; }
public Vector2 PositionOriginal { get; } public Vector2 PositionOriginal { get; }
public Vector2 PositionRandomised { get; set; } public Vector2 PositionRandomised { get; set; }