diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
index 368166157d..015a922719 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOsuDistanceSnapGrid.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
[Cached(typeof(IDistanceSnapProvider))]
private readonly SnapProvider snapProvider = new SnapProvider();
- private TestOsuDistanceSnapGrid grid;
+ private OsuDistanceSnapGrid grid;
public TestSceneOsuDistanceSnapGrid()
{
@@ -64,7 +64,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
RelativeSizeAxes = Axes.Both,
Colour = Color4.SlateGray
},
- grid = new TestOsuDistanceSnapGrid(new HitCircle { Position = grid_position }),
+ grid = new OsuDistanceSnapGrid(new HitCircle { Position = grid_position }),
new SnappingCursorContainer { GetSnapPosition = v => grid.GetSnappedPosition(grid.ToLocalSpace(v)).position }
};
});
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
RelativeSizeAxes = Axes.Both,
Colour = Color4.SlateGray
},
- grid = new TestOsuDistanceSnapGrid(new HitCircle { Position = grid_position }, new HitCircle { StartTime = 200 }),
+ grid = new OsuDistanceSnapGrid(new HitCircle { Position = grid_position }, new HitCircle { StartTime = 200 }),
new SnappingCursorContainer { GetSnapPosition = v => grid.GetSnappedPosition(grid.ToLocalSpace(v)).position }
};
});
@@ -170,16 +170,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor
}
}
- private class TestOsuDistanceSnapGrid : OsuDistanceSnapGrid
- {
- public new float DistanceSpacing => base.DistanceSpacing;
-
- public TestOsuDistanceSnapGrid(OsuHitObject hitObject, OsuHitObject nextHitObject = null)
- : base(hitObject, nextHitObject)
- {
- }
- }
-
private class SnapProvider : IDistanceSnapProvider
{
public SnapResult FindSnappedPosition(Vector2 screenSpacePosition) =>
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
index 38c0808a71..cdaa3739b7 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneDistanceSnapGrid.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Tests.Visual.Editing
private class TestDistanceSnapGrid : DistanceSnapGrid
{
- public new float DistanceSpacing => base.DistanceSpacing;
+ public new float DistanceBetweenTick => base.DistanceBetweenTick;
public TestDistanceSnapGrid(double? endTime = null)
: base(new HitObject(), grid_position, 0, endTime)
@@ -105,7 +105,7 @@ namespace osu.Game.Tests.Visual.Editing
int indexFromPlacement = 0;
- for (float s = StartPosition.X + DistanceSpacing; s <= DrawWidth && indexFromPlacement < MaxIntervals; s += DistanceSpacing, indexFromPlacement++)
+ for (float s = StartPosition.X + DistanceBetweenTick; s <= DrawWidth && indexFromPlacement < MaxIntervals; s += DistanceBetweenTick, indexFromPlacement++)
{
AddInternal(new Circle
{
@@ -118,7 +118,7 @@ namespace osu.Game.Tests.Visual.Editing
indexFromPlacement = 0;
- for (float s = StartPosition.X - DistanceSpacing; s >= 0 && indexFromPlacement < MaxIntervals; s -= DistanceSpacing, indexFromPlacement++)
+ for (float s = StartPosition.X - DistanceBetweenTick; s >= 0 && indexFromPlacement < MaxIntervals; s -= DistanceBetweenTick, indexFromPlacement++)
{
AddInternal(new Circle
{
@@ -131,7 +131,7 @@ namespace osu.Game.Tests.Visual.Editing
indexFromPlacement = 0;
- for (float s = StartPosition.Y + DistanceSpacing; s <= DrawHeight && indexFromPlacement < MaxIntervals; s += DistanceSpacing, indexFromPlacement++)
+ for (float s = StartPosition.Y + DistanceBetweenTick; s <= DrawHeight && indexFromPlacement < MaxIntervals; s += DistanceBetweenTick, indexFromPlacement++)
{
AddInternal(new Circle
{
@@ -144,7 +144,7 @@ namespace osu.Game.Tests.Visual.Editing
indexFromPlacement = 0;
- for (float s = StartPosition.Y - DistanceSpacing; s >= 0 && indexFromPlacement < MaxIntervals; s -= DistanceSpacing, indexFromPlacement++)
+ for (float s = StartPosition.Y - DistanceBetweenTick; s >= 0 && indexFromPlacement < MaxIntervals; s -= DistanceBetweenTick, indexFromPlacement++)
{
AddInternal(new Circle
{
diff --git a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
index 50d5f0389a..76e429dbeb 100644
--- a/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/CircularDistanceSnapGrid.cs
@@ -30,14 +30,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
Position = StartPosition,
Width = crosshair_thickness,
EdgeSmoothness = new Vector2(1),
- Height = Math.Min(crosshair_max_size, DistanceSpacing * 2),
+ Height = Math.Min(crosshair_max_size, DistanceBetweenTick * 2),
},
new Box
{
Origin = Anchor.Centre,
Position = StartPosition,
EdgeSmoothness = new Vector2(1),
- Width = Math.Min(crosshair_max_size, DistanceSpacing * 2),
+ Width = Math.Min(crosshair_max_size, DistanceBetweenTick * 2),
Height = crosshair_thickness,
}
});
@@ -45,11 +45,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
float dx = Math.Max(StartPosition.X, DrawWidth - StartPosition.X);
float dy = Math.Max(StartPosition.Y, DrawHeight - StartPosition.Y);
float maxDistance = new Vector2(dx, dy).Length;
- int requiredCircles = Math.Min(MaxIntervals, (int)(maxDistance / DistanceSpacing));
+ int requiredCircles = Math.Min(MaxIntervals, (int)(maxDistance / DistanceBetweenTick));
for (int i = 0; i < requiredCircles; i++)
{
- float radius = (i + 1) * DistanceSpacing * 2;
+ float radius = (i + 1) * DistanceBetweenTick * 2;
AddInternal(new CircularProgress
{
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
float distance = direction.Length;
- float radius = DistanceSpacing;
+ float radius = DistanceBetweenTick;
int radialCount = Math.Clamp((int)MathF.Round(distance / radius), 1, MaxIntervals);
Vector2 normalisedDirection = direction * new Vector2(1f / distance);
diff --git a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
index 5568c15514..42bb8a813d 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
///
/// The spacing between each tick of the beat snapping grid.
///
- protected float DistanceSpacing { get; private set; }
+ protected float DistanceBetweenTick { get; private set; }
///
/// The maximum number of distance snapping intervals allowed.
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
///
/// The position which the grid should start.
- /// The first beat snapping tick is located at + away from this point.
+ /// The first beat snapping tick is located at + away from this point.
///
protected readonly Vector2 StartPosition;
@@ -92,7 +92,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
private void updateSpacing()
{
- DistanceSpacing = (float)(SnapProvider.GetBeatSnapDistanceAt(ReferenceObject) * distanceSpacingMultiplier.Value);
+ DistanceBetweenTick = (float)(SnapProvider.GetBeatSnapDistanceAt(ReferenceObject) * distanceSpacingMultiplier.Value);
if (endTime == null)
MaxIntervals = int.MaxValue;
@@ -100,7 +100,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
{
// +1 is added since a snapped hitobject may have its start time slightly less than the snapped time due to floating point errors
double maxDuration = endTime.Value - StartTime + 1;
- MaxIntervals = (int)(maxDuration / SnapProvider.DistanceToDuration(ReferenceObject, DistanceSpacing));
+ MaxIntervals = (int)(maxDuration / SnapProvider.DistanceToDuration(ReferenceObject, DistanceBetweenTick));
}
gridCache.Invalidate();