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

Propagate mania column in SnapResult

Browse Source
This commit is contained in:
Dean Herbert
2020-05-20 19:09:04 +09:00
parent 82d6549161
commit 62092e3f5b
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
View File

@ -46,11 +46,13 @@ namespace osu.Game.Rulesets.Mania.Edit
public override SnapResult SnapScreenSpacePositionToValidTime(Vector2 screenSpacePosition)
{
var hoc = ColumnAt(screenSpacePosition)?.HitObjectContainer;
var column = ColumnAt(screenSpacePosition);
if (hoc == null)
if (column == null)
return new SnapResult(screenSpacePosition, null);
var hoc = column.HitObjectContainer;
Vector2 localPosition = hoc.ToLocalSpace(screenSpacePosition);
if (drawableRuleset.ScrollingInfo.Direction.Value == ScrollingDirection.Down)
@ -73,7 +75,7 @@ namespace osu.Game.Rulesets.Mania.Edit
hoc.DrawHeight))
).Y;
return new SnapResult(screenSpacePosition, BeatSnapProvider.SnapTime(targetTime));
return new ManiaSnapResult(screenSpacePosition, BeatSnapProvider.SnapTime(targetTime), column);
}
protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
@ -94,4 +96,15 @@ namespace osu.Game.Rulesets.Mania.Edit
new HoldNoteCompositionTool()
};
}
public class ManiaSnapResult : SnapResult
{
public readonly Column Column;
public ManiaSnapResult(Vector2 screenSpacePosition, double time, Column column)
: base(screenSpacePosition, time)
{
Column = column;
}
}
}