h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 23:59:16 +08:00
Code Issues Releases Wiki Activity

Simplify cycle logic

Browse Source
This commit is contained in:
Dean Herbert 2024-10-12 02:18:21 +09:00
parent d07a2fbb57
commit 05c8b3cbce
No known key found for this signature in database
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,6 +215,8 @@ namespace osu.Game.Rulesets.Osu.Edit
{ {
GridLinesRotation.Disabled = v.NewValue == PositionSnapGridType.Circle; GridLinesRotation.Disabled = v.NewValue == PositionSnapGridType.Circle;
gridTypeButtons.Items[(int)v.NewValue].Select();
switch (v.NewValue) switch (v.NewValue)
{ {
case PositionSnapGridType.Square: case PositionSnapGridType.Square:
@ -243,28 +245,16 @@ namespace osu.Game.Rulesets.Osu.Edit
return ((rotation + 360 + period * 0.5f) % period) - period * 0.5f; return ((rotation + 360 + period * 0.5f) % period) - period * 0.5f;
} }
private void nextGridSize()
{
Spacing.Value = Spacing.Value * 2 >= max_automatic_spacing ? Spacing.Value / 8 : Spacing.Value * 2;
}
private void nextGridType()
{
int nextGridTypeIndex = (Array.IndexOf(grid_types, GridType.Value) + 1) % grid_types.Length;
GridType.Value = grid_types[nextGridTypeIndex];
gridTypeButtons.Items[nextGridTypeIndex].Select();
}
public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
{ {
switch (e.Action) switch (e.Action)
{ {
case GlobalAction.EditorCycleGridSpacing: case GlobalAction.EditorCycleGridSpacing:
nextGridSize(); Spacing.Value = Spacing.Value * 2 >= max_automatic_spacing ? Spacing.Value / 8 : Spacing.Value * 2;
return true; return true;
case GlobalAction.EditorCycleGridType: case GlobalAction.EditorCycleGridType:
nextGridType(); GridType.Value = (PositionSnapGridType)(((int)GridType.Value + 1) % Enum.GetValues<PositionSnapGridType>().Length);
return true; return true;
} }