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

Split out and clean up playfield sizing references

Browse Source
This commit is contained in:
Dean Herbert
2021-05-24 14:24:56 +09:00
parent 8dd3f11d28
commit 88d7bc195d
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,10 +29,16 @@ namespace osu.Game.Rulesets.Osu.Mods
public override string Description => "It never gets boring!"; public override string Description => "It never gets boring!";
public override bool Ranked => false; public override bool Ranked => false;
// The distances from the hit objects to the borders of the playfield they start to "turn around" and curve towards the middle. // The relative distance to the edge of the playfield before objects' positions should start to "turn around" and curve towards the middle.
// The closer the hit objects draw to the border, the sharper the turn // The closer the hit objects draw to the border, the sharper the turn
private const byte border_distance_x = 192; private const float playfield_edge_ratio = 0.375f;
private const byte border_distance_y = 144;
private static readonly float border_distance_x = OsuPlayfield.BASE_SIZE.X * playfield_edge_ratio;
private static readonly float border_distance_y = OsuPlayfield.BASE_SIZE.Y * playfield_edge_ratio;
private static readonly Vector2 playfield_middle = Vector2.Divide(OsuPlayfield.BASE_SIZE, 2);
private static readonly float playfield_diagonal = OsuPlayfield.BASE_SIZE.LengthFast;
[SettingSource("Seed", "Use a custom seed instead of a random one", SettingControlType = typeof(OsuModRandomSettingsControl))] [SettingSource("Seed", "Use a custom seed instead of a random one", SettingControlType = typeof(OsuModRandomSettingsControl))]
public Bindable<int?> Seed { get; } = new Bindable<int?> public Bindable<int?> Seed { get; } = new Bindable<int?>
@ -130,8 +136,7 @@ namespace osu.Game.Rulesets.Osu.Mods
// 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.
var maxDistance = OsuPlayfield.BASE_SIZE.LengthFast; var randomAngleRad = rateOfChangeMultiplier * 2 * Math.PI * distanceToPrev / playfield_diagonal;
var randomAngleRad = rateOfChangeMultiplier * 2 * Math.PI * distanceToPrev / maxDistance;
currentObjectInfo.AngleRad = (float)randomAngleRad + prevObjectInfo.AngleRad; currentObjectInfo.AngleRad = (float)randomAngleRad + prevObjectInfo.AngleRad;
if (currentObjectInfo.AngleRad < 0) if (currentObjectInfo.AngleRad < 0)
@ -145,6 +150,7 @@ namespace osu.Game.Rulesets.Osu.Mods
posRelativeToPrev = getRotatedVector(prevObjectInfo.EndPositionRandomised, posRelativeToPrev); posRelativeToPrev = getRotatedVector(prevObjectInfo.EndPositionRandomised, posRelativeToPrev);
currentObjectInfo.AngleRad = (float)Math.Atan2(posRelativeToPrev.Y, posRelativeToPrev.X); currentObjectInfo.AngleRad = (float)Math.Atan2(posRelativeToPrev.Y, posRelativeToPrev.X);
var position = Vector2.Add(prevObjectInfo.EndPositionRandomised, posRelativeToPrev); var position = Vector2.Add(prevObjectInfo.EndPositionRandomised, posRelativeToPrev);
// Move hit objects back into the playfield if they are outside of it, // Move hit objects back into the playfield if they are outside of it,
@ -192,9 +198,8 @@ namespace osu.Game.Rulesets.Osu.Mods
private Vector2 getRotatedVector(Vector2 prevPosChanged, Vector2 posRelativeToPrev) private Vector2 getRotatedVector(Vector2 prevPosChanged, Vector2 posRelativeToPrev)
{ {
var relativeRotationDistance = 0f; var relativeRotationDistance = 0f;
var playfieldMiddle = Vector2.Divide(OsuPlayfield.BASE_SIZE, 2);
if (prevPosChanged.X < playfieldMiddle.X) if (prevPosChanged.X < playfield_middle.X)
{ {
relativeRotationDistance = Math.Max( relativeRotationDistance = Math.Max(
(border_distance_x - prevPosChanged.X) / border_distance_x, (border_distance_x - prevPosChanged.X) / border_distance_x,
@ -209,7 +214,7 @@ namespace osu.Game.Rulesets.Osu.Mods
); );
} }
if (prevPosChanged.Y < playfieldMiddle.Y) if (prevPosChanged.Y < playfield_middle.Y)
{ {
relativeRotationDistance = Math.Max( relativeRotationDistance = Math.Max(
(border_distance_y - prevPosChanged.Y) / border_distance_y, (border_distance_y - prevPosChanged.Y) / border_distance_y,
@ -224,11 +229,7 @@ namespace osu.Game.Rulesets.Osu.Mods
); );
} }
return rotateVectorTowardsVector( return rotateVectorTowardsVector(posRelativeToPrev, playfield_middle - prevPosChanged, relativeRotationDistance / 2);
posRelativeToPrev,
Vector2.Subtract(playfieldMiddle, prevPosChanged),
relativeRotationDistance / 2
);
} }
/// <summary> /// <summary>