forked from ppy/osu
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request ppy#26309 from OliBomby/grids-1
Add ability to change position, spacing, and rotation of the positional snap grid in the editor
- Loading branch information
Showing
10 changed files
with
555 additions
and
208 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. | ||
| // See the LICENCE file in the repository root for full licence text. | ||
|
|
||
| using osu.Framework.Allocation; | ||
| using osu.Framework.Bindables; | ||
| using osu.Framework.Graphics; | ||
| using osu.Framework.Input.Bindings; | ||
| using osu.Framework.Input.Events; | ||
| using osu.Game.Graphics.UserInterface; | ||
| using osu.Game.Input.Bindings; | ||
| using osu.Game.Rulesets.Edit; | ||
| using osu.Game.Rulesets.Osu.UI; | ||
| using osu.Game.Screens.Edit; | ||
| using osuTK; | ||
|
|
||
| namespace osu.Game.Rulesets.Osu.Edit | ||
| { | ||
| public partial class OsuGridToolboxGroup : EditorToolboxGroup, IKeyBindingHandler<GlobalAction> | ||
| { | ||
| [Resolved] | ||
| private EditorBeatmap editorBeatmap { get; set; } = null!; | ||
|
|
||
| /// <summary> | ||
| /// X position of the grid's origin. | ||
| /// </summary> | ||
| public BindableFloat StartPositionX { get; } = new BindableFloat(OsuPlayfield.BASE_SIZE.X / 2) | ||
| { | ||
| MinValue = 0f, | ||
| MaxValue = OsuPlayfield.BASE_SIZE.X, | ||
| Precision = 1f | ||
| }; | ||
|
|
||
| /// <summary> | ||
| /// Y position of the grid's origin. | ||
| /// </summary> | ||
| public BindableFloat StartPositionY { get; } = new BindableFloat(OsuPlayfield.BASE_SIZE.Y / 2) | ||
| { | ||
| MinValue = 0f, | ||
| MaxValue = OsuPlayfield.BASE_SIZE.Y, | ||
| Precision = 1f | ||
| }; | ||
|
|
||
| /// <summary> | ||
| /// The spacing between grid lines. | ||
| /// </summary> | ||
| public BindableFloat Spacing { get; } = new BindableFloat(4f) | ||
| { | ||
| MinValue = 4f, | ||
| MaxValue = 128f, | ||
| Precision = 1f | ||
| }; | ||
|
|
||
| /// <summary> | ||
| /// Rotation of the grid lines in degrees. | ||
| /// </summary> | ||
| public BindableFloat GridLinesRotation { get; } = new BindableFloat(0f) | ||
| { | ||
| MinValue = -45f, | ||
| MaxValue = 45f, | ||
| Precision = 1f | ||
| }; | ||
|
|
||
| /// <summary> | ||
| /// Read-only bindable representing the grid's origin. | ||
| /// Equivalent to <code>new Vector2(StartPositionX, StartPositionY)</code> | ||
| /// </summary> | ||
| public Bindable<Vector2> StartPosition { get; } = new Bindable<Vector2>(); | ||
|
|
||
| /// <summary> | ||
| /// Read-only bindable representing the grid's spacing in both the X and Y dimension. | ||
| /// Equivalent to <code>new Vector2(Spacing)</code> | ||
| /// </summary> | ||
| public Bindable<Vector2> SpacingVector { get; } = new Bindable<Vector2>(); | ||
|
|
||
| private ExpandableSlider<float> startPositionXSlider = null!; | ||
| private ExpandableSlider<float> startPositionYSlider = null!; | ||
| private ExpandableSlider<float> spacingSlider = null!; | ||
| private ExpandableSlider<float> gridLinesRotationSlider = null!; | ||
|
|
||
| public OsuGridToolboxGroup() | ||
| : base("grid") | ||
| { | ||
| } | ||
|
|
||
| private const float max_automatic_spacing = 64; | ||
|
|
||
| [BackgroundDependencyLoader] | ||
| private void load() | ||
| { | ||
| Children = new Drawable[] | ||
| { | ||
| startPositionXSlider = new ExpandableSlider<float> | ||
| { | ||
| Current = StartPositionX, | ||
| KeyboardStep = 1, | ||
| }, | ||
| startPositionYSlider = new ExpandableSlider<float> | ||
| { | ||
| Current = StartPositionY, | ||
| KeyboardStep = 1, | ||
| }, | ||
| spacingSlider = new ExpandableSlider<float> | ||
| { | ||
| Current = Spacing, | ||
| KeyboardStep = 1, | ||
| }, | ||
| gridLinesRotationSlider = new ExpandableSlider<float> | ||
| { | ||
| Current = GridLinesRotation, | ||
| KeyboardStep = 1, | ||
| }, | ||
| }; | ||
|
|
||
| Spacing.Value = editorBeatmap.BeatmapInfo.GridSize; | ||
| } | ||
|
|
||
| protected override void LoadComplete() | ||
| { | ||
| base.LoadComplete(); | ||
|
|
||
| StartPositionX.BindValueChanged(x => | ||
| { | ||
| startPositionXSlider.ContractedLabelText = $"X: {x.NewValue:N0}"; | ||
| startPositionXSlider.ExpandedLabelText = $"X Offset: {x.NewValue:N0}"; | ||
| StartPosition.Value = new Vector2(x.NewValue, StartPosition.Value.Y); | ||
| }, true); | ||
|
|
||
| StartPositionY.BindValueChanged(y => | ||
| { | ||
| startPositionYSlider.ContractedLabelText = $"Y: {y.NewValue:N0}"; | ||
| startPositionYSlider.ExpandedLabelText = $"Y Offset: {y.NewValue:N0}"; | ||
| StartPosition.Value = new Vector2(StartPosition.Value.X, y.NewValue); | ||
| }, true); | ||
|
|
||
| Spacing.BindValueChanged(spacing => | ||
| { | ||
| spacingSlider.ContractedLabelText = $"S: {spacing.NewValue:N0}"; | ||
| spacingSlider.ExpandedLabelText = $"Spacing: {spacing.NewValue:N0}"; | ||
| SpacingVector.Value = new Vector2(spacing.NewValue); | ||
| editorBeatmap.BeatmapInfo.GridSize = (int)spacing.NewValue; | ||
| }, true); | ||
|
|
||
| GridLinesRotation.BindValueChanged(rotation => | ||
| { | ||
| gridLinesRotationSlider.ContractedLabelText = $"R: {rotation.NewValue:#,0.##}"; | ||
| gridLinesRotationSlider.ExpandedLabelText = $"Rotation: {rotation.NewValue:#,0.##}"; | ||
| }, true); | ||
| } | ||
|
|
||
| private void nextGridSize() | ||
| { | ||
| Spacing.Value = Spacing.Value * 2 >= max_automatic_spacing ? Spacing.Value / 8 : Spacing.Value * 2; | ||
| } | ||
|
|
||
| public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) | ||
| { | ||
| switch (e.Action) | ||
| { | ||
| case GlobalAction.EditorCycleGridDisplayMode: | ||
| nextGridSize(); | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e) | ||
| { | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.