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

Combine implementation of time-to-position lookup

Browse Source
This commit is contained in:
Dean Herbert
2020-05-20 21:42:21 +09:00
parent 63b5f1a376
commit 69db62b78a
5 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ namespace osu.Game.Rulesets.Mania.Edit
var hoc = column.HitObjectContainer;
// convert to local space of column so we can snap and fetch correct location.
Vector2 localPosition = hoc.ToLocalSpace(screenSpacePosition);
var scrollInfo = drawableRuleset.ScrollingInfo;
@ -65,24 +66,31 @@ namespace osu.Game.Rulesets.Mania.Edit
localPosition.Y = hoc.DrawHeight - localPosition.Y;
}
double targetTime = scrollInfo.Algorithm.TimeAt(localPosition.Y,
EditorClock.CurrentTime,
scrollInfo.TimeRange.Value,
hoc.DrawHeight);
double targetTime = scrollInfo.Algorithm.TimeAt(localPosition.Y, EditorClock.CurrentTime, scrollInfo.TimeRange.Value, hoc.DrawHeight);
// apply beat snapping
targetTime = BeatSnapProvider.SnapTime(targetTime);
localPosition = new Vector2(
hoc.DrawWidth / 2,
scrollInfo.Algorithm.PositionAt(targetTime, EditorClock.CurrentTime, scrollInfo.TimeRange.Value, hoc.DrawHeight));
// convert back to screen space
screenSpacePosition = ScreenSpacePositionAtTime(targetTime, column);
return new ManiaSnapResult(screenSpacePosition, targetTime, column);
}
public Vector2 ScreenSpacePositionAtTime(double time, Column column = null)
{
var hoc = (column ?? Playfield.GetColumn(0)).HitObjectContainer;
var scrollInfo = drawableRuleset.ScrollingInfo;
var pos = scrollInfo.Algorithm.PositionAt(time, EditorClock.CurrentTime, scrollInfo.TimeRange.Value, hoc.DrawHeight);
if (scrollInfo.Direction.Value == ScrollingDirection.Down)
{
// reapply the above.
localPosition.Y = hoc.DrawHeight - localPosition.Y;
// as explained above
pos = hoc.DrawHeight - pos;
}
return new ManiaSnapResult(hoc.ToScreenSpace(localPosition), BeatSnapProvider.SnapTime(targetTime), column);
return hoc.ToScreenSpace(new Vector2(hoc.DrawWidth / 2, pos));
}
protected override DrawableRuleset<ManiaHitObject> CreateDrawableRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)