RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-02 17:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move special case handling back to moveSliderIntoPlayfield

Browse Source
This commit is contained in:
Henry Lin 2021-07-01 10:59:06 +08:00
parent 6e1839fcf2
commit 7585f1f790
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,14 +148,20 @@ namespace osu.Game.Rulesets.Osu.Mods
/// <returns>The <see cref="Vector2"/> that this slider has been shifted by.</returns> /// <returns>The <see cref="Vector2"/> that this slider has been shifted by.</returns>
private Vector2 moveSliderIntoPlayfield(Slider slider, RandomObjectInfo currentObjectInfo) private Vector2 moveSliderIntoPlayfield(Slider slider, RandomObjectInfo currentObjectInfo)
{ {
var minMargin = getSliderBoundingBox(slider); var boundingBox = getSliderBoundingBox(slider);
var prevPosition = slider.Position; var prevPosition = slider.Position;
slider.Position = new Vector2( // If the slider is larger than the playfield, force it to stay at the original position
Math.Clamp(slider.Position.X, minMargin.Left, minMargin.Right), var newX = boundingBox.Width < 0
Math.Clamp(slider.Position.Y, minMargin.Top, minMargin.Bottom) ? currentObjectInfo.PositionOriginal.X
); : Math.Clamp(slider.Position.X, boundingBox.Left, boundingBox.Right);
var newY = boundingBox.Height < 0
? currentObjectInfo.PositionOriginal.Y
: Math.Clamp(slider.Position.Y, boundingBox.Top, boundingBox.Bottom);
slider.Position = new Vector2(newX, newY);
currentObjectInfo.PositionRandomised = slider.Position; currentObjectInfo.PositionRandomised = slider.Position;
currentObjectInfo.EndPositionRandomised = slider.EndPosition; currentObjectInfo.EndPositionRandomised = slider.EndPosition;
@ -192,7 +198,7 @@ namespace osu.Game.Rulesets.Osu.Mods
var pathPositions = new List<Vector2>(); var pathPositions = new List<Vector2>();
slider.Path.GetPathToProgress(pathPositions, 0, 1); slider.Path.GetPathToProgress(pathPositions, 0, 1);
var box = new RectangleF(); var box = new RectangleF(Vector2.Zero, OsuPlayfield.BASE_SIZE);
foreach (var pos in pathPositions) foreach (var pos in pathPositions)
{ {
@ -209,19 +215,6 @@ namespace osu.Game.Rulesets.Osu.Mods
box.Width -= radius * 2; box.Width -= radius * 2;
box.Height -= radius * 2; box.Height -= radius * 2;
// If the slider is larger than the playfield, force the slider to stay at its original position
if (box.Width < 0)
{
box.Width = 0;
box.X = slider.Position.X;
}
if (box.Height < 0)
{
box.Height = 0;
box.Y = slider.Position.Y;
}
return box; return box;
} }