Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ability to change position, spacing, and rotation of the positional snap grid in the editor #26309

Merged
merged 36 commits into from
Jun 5, 2024
Merged

Add ability to change position, spacing, and rotation of the positional snap grid in the editor #26309

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
f3b88c3
Add rotation to snap grid visual
OliBomby Dec 28, 2023
f2edd70
add rotation to snapped position
OliBomby Dec 28, 2023
2193601
fix typo
OliBomby Dec 28, 2023
92c3b14
Added Triangular snap grid
OliBomby Dec 28, 2023
d0c8b28
clean up code duplication
OliBomby Dec 28, 2023
a20c430
fix wrong grid cache being used
OliBomby Dec 28, 2023
b16c232
add basic control by grid tool box
OliBomby Dec 28, 2023
0ce1a48
Add comment
OliBomby Dec 28, 2023
f223487
improve code
OliBomby Dec 28, 2023
351cfbf
Fix snapping going out of bounds
OliBomby Dec 28, 2023
8ef9bdf
clarify comment
OliBomby Dec 28, 2023
040fd5e
Add option to change grid type
OliBomby Dec 29, 2023
8a33105
Make it actually possible to change grid type
OliBomby Dec 29, 2023
847f04e
reduce opacity of middle cardinal lines
OliBomby Dec 29, 2023
d0ca3f2
Add circular grid
OliBomby Dec 29, 2023
f649fa1
Added bindables and binding with BindTo
OliBomby Dec 29, 2023
1c75357
fix compile
OliBomby Dec 30, 2023
9a8c41f
Saving exact grid spacing
OliBomby Dec 30, 2023
493e3a5
use G to change grid type
OliBomby Dec 31, 2023
e47d570
improve UI
OliBomby Dec 31, 2023
904ea2e
move OutlineTriangle code down
OliBomby Dec 31, 2023
33e559f
add integer keyboard step to sliders
OliBomby Dec 31, 2023
20e338b
also hide grid from points button when not hovered
OliBomby Dec 31, 2023
8425c72
fix rectangular and triangular grid tests
OliBomby Dec 31, 2023
31d1799
Create TestSceneCircularPositionSnapGrid.cs
OliBomby Dec 31, 2023
9796fcf
Merge position snap grid tests into single file
OliBomby Dec 31, 2023
c5edf43
fix grid test
OliBomby Dec 31, 2023
594b6fe
Add back the old keybind for cycling grid spacing
OliBomby Dec 31, 2023
39f4a1a
conflict fixes
OliBomby Jan 1, 2024
de14da9
Remove other grid types
OliBomby Jan 1, 2024
460c584
fix code quality
OliBomby Jan 1, 2024
1428cbf
Remove Masking from PositionSnapGrid
OliBomby Feb 1, 2024
9f19ab0
Merge branch 'master' into grids-1
bdach May 24, 2024
4977019
fix nitpick
OliBomby May 24, 2024
4fcb902
Merge branch 'master' into grids-1
bdach Jun 3, 2024
212be6b
Merge branch 'master' into grids-1
peppy Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix code quality
  • Loading branch information
@OliBomby
OliBomby committed Jan 1, 2024
commit 460c584dca79ec4dc40df0f49e6721edcb6e6fa9
4 changes: 0 additions & 4 deletions osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using osu.Framework.Graphics;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
using osu.Game.Input.Bindings;
using osu.Game.Rulesets.Edit;
Expand All @@ -21,9 +20,6 @@ public partial class OsuGridToolboxGroup : EditorToolboxGroup, IKeyBindingHandle
[Resolved]
private EditorBeatmap editorBeatmap { get; set; } = null!;

[Resolved]
private IExpandingContainer? expandingContainer { get; set; }

/// <summary>
/// X position of the grid's origin.
/// </summary>
Expand Down
Loading