h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 17:27:24 +08:00
Code Issues Releases Wiki Activity

take into account rotation period for each grid type

Browse Source
This commit is contained in:
OliBomby 2024-09-19 20:18:24 +02:00
parent e3aeaf6d85
commit d2f97f5908
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
View File

@ -104,9 +104,11 @@ namespace osu.Game.Rulesets.Osu.Edit
StartPositionY.Value = point1.Y; StartPositionY.Value = point1.Y;
// Get the angle between the two points and normalize to the valid range. // Get the angle between the two points and normalize to the valid range.
const float period = 180; if (!GridLinesRotation.Disabled)
GridLinesRotation.Value = (MathHelper.RadiansToDegrees(MathF.Atan2(point2.Y - point1.Y, point2.X - point1.X)) {
+ period * 1.5f) % period - period * 0.5f; float period = GridLinesRotation.MaxValue - GridLinesRotation.MinValue;
GridLinesRotation.Value = normalizeRotation(MathHelper.RadiansToDegrees(MathF.Atan2(point2.Y - point1.Y, point2.X - point1.X)), period);
}
// Divide the distance so that there is a good density of grid lines. // Divide the distance so that there is a good density of grid lines.
float dist = Vector2.Distance(point1, point2); float dist = Vector2.Distance(point1, point2);
@ -231,13 +233,13 @@ namespace osu.Game.Rulesets.Osu.Edit
switch (v.NewValue) switch (v.NewValue)
{ {
case PositionSnapGridType.Square: case PositionSnapGridType.Square:
GridLinesRotation.Value = ((GridLinesRotation.Value + 405) % 90) - 45; GridLinesRotation.Value = normalizeRotation(GridLinesRotation.Value, 90);
GridLinesRotation.MinValue = -45; GridLinesRotation.MinValue = -45;
GridLinesRotation.MaxValue = 45; GridLinesRotation.MaxValue = 45;
break; break;
case PositionSnapGridType.Triangle: case PositionSnapGridType.Triangle:
GridLinesRotation.Value = ((GridLinesRotation.Value + 390) % 60) - 30; GridLinesRotation.Value = normalizeRotation(GridLinesRotation.Value, 60);
GridLinesRotation.MinValue = -30; GridLinesRotation.MinValue = -30;
GridLinesRotation.MaxValue = 30; GridLinesRotation.MaxValue = 30;
break; break;
@ -245,6 +247,11 @@ namespace osu.Game.Rulesets.Osu.Edit
}, true); }, true);
} }
private float normalizeRotation(float rotation, float period)
{
return ((rotation + 360 + period * 0.5f) % period) - period * 0.5f;
}
private void nextGridSize() private void nextGridSize()
{ {
Spacing.Value = Spacing.Value * 2 >= max_automatic_spacing ? Spacing.Value / 8 : Spacing.Value * 2; Spacing.Value = Spacing.Value * 2 >= max_automatic_spacing ? Spacing.Value / 8 : Spacing.Value * 2;