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

Undo beat snapping related changes

Browse Source
This commit is contained in:
Dean Herbert
2020-05-21 12:11:39 +09:00
parent ea45637b02
commit 83a5913b8d
2 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,18 +82,9 @@ namespace osu.Game.Rulesets.Mania.Edit
public override (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time)
{
var beatSnapped = beatSnapGrid.GetSnappedPosition(position);
var hoc = Playfield.GetColumn(0).HitObjectContainer;
if (beatSnapped != null)
return beatSnapped.Value;
return base.GetSnappedPosition(position, getTimeFromPosition(ToScreenSpace(position)));
}
private double getTimeFromPosition(Vector2 screenSpacePosition)
{
var hoc = Playfield.Stages[0].HitObjectContainer;
float targetPosition = hoc.ToLocalSpace(screenSpacePosition).Y;
float targetPosition = hoc.ToLocalSpace(ToScreenSpace(position)).Y;
if (drawableRuleset.ScrollingInfo.Direction.Value == ScrollingDirection.Down)
{
@ -103,10 +94,12 @@ namespace osu.Game.Rulesets.Mania.Edit
targetPosition = hoc.DrawHeight - targetPosition;
}
return drawableRuleset.ScrollingInfo.Algorithm.TimeAt(targetPosition,
double targetTime = drawableRuleset.ScrollingInfo.Algorithm.TimeAt(targetPosition,
EditorClock.CurrentTime,
drawableRuleset.ScrollingInfo.TimeRange.Value,
hoc.DrawHeight);
return base.GetSnappedPosition(position, targetTime);
}
protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)