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

Expose StartPosition for derived grids to use

Browse Source
This commit is contained in:
smoogipoo
2019-10-11 15:30:31 +09:00
parent 97d4a8e59e
commit 66e0fef85b
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Screens/Edit/Compose/Components/BeatSnapGrid.cs
View File

@ -6,7 +6,6 @@ using osu.Framework.Caching;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour; using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Timing;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints; using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Graphics; using osu.Game.Graphics;
@ -22,6 +21,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
protected float DistanceSpacing { get; private set; } protected float DistanceSpacing { get; private set; }
protected readonly Vector2 StartPosition;
[Resolved] [Resolved]
private IEditorBeatmap beatmap { get; set; } private IEditorBeatmap beatmap { get; set; }
@ -34,7 +34,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
private readonly Cached gridCache = new Cached(); private readonly Cached gridCache = new Cached();
private readonly HitObject hitObject; private readonly HitObject hitObject;
private readonly Vector2 startPosition;
private double startTime; private double startTime;
private double beatLength; private double beatLength;
@ -42,7 +41,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
protected BeatSnapGrid(HitObject hitObject, Vector2 startPosition) protected BeatSnapGrid(HitObject hitObject, Vector2 startPosition)
{ {
this.hitObject = hitObject; this.hitObject = hitObject;
this.startPosition = startPosition; this.StartPosition = startPosition;
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
} }
@ -83,7 +82,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
if (!gridCache.IsValid) if (!gridCache.IsValid)
{ {
ClearInternal(); ClearInternal();
CreateGrid(startPosition); CreateGrid(StartPosition);
gridCache.Validate(); gridCache.Validate();
} }
} }
@ -114,7 +113,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
/// </summary> /// </summary>
/// <param name="snappedPosition">The snapped position.</param> /// <param name="snappedPosition">The snapped position.</param>
/// <returns>The time at the snapped position.</returns> /// <returns>The time at the snapped position.</returns>
public double GetSnapTime(Vector2 snappedPosition) => startTime + (ToLocalSpace(snappedPosition) - startPosition).Length / Velocity; public double GetSnapTime(Vector2 snappedPosition) => startTime + (ToLocalSpace(snappedPosition) - StartPosition).Length / Velocity;
/// <summary> /// <summary>
/// Retrieves the applicable colour for a beat index. /// Retrieves the applicable colour for a beat index.