Enhanced brush mode #17

zacharied · 2024-10-20T18:41:54Z

TODO

[x] Refactor selection area code
[x] Enable click selection with FilterSubmode
[x] Fix missing Brush button text
[x] Fix crash when clicking on LaneBlock in batch mode
[ ] Add menu bar buttons so users can discover keybinds
[ ] Allow dragging when starting drag on non-filter object (out of scope?)

Brush mode improvements

Brush mode has been changed. When in Brush Mode, an overlay is shown in the bottom left. It shows the input object.

By default, the input object is "Clipboard", which is the same as the old brush mode behavior.

Changing input object

The user can press keys to change the input object. See CommandDefinitions for the full list.

Insert input object

Left Click inserts the input object. If Alt or Ctrl is held, modifiers are applied to some inputs. If Shift is held, the previous selection will be kept; otherwise the selection will be cleared.

Deleting input object

If the input object is not "Clipboard", Right Click deletes instances of the input object.

Change selection

If Alt is held while clicking and dragging, normal box selection will be used. This is so that the user does not have to exit Brush Mode to change selection.

Questions

@MikiraSora, before I finish localizing and bugfixing, I want to make sure you like this.

Are you okay with implementing brush mode as a Behavior?
Any other keybinds I should add to brush mode?
I wanted to add a "preview" of the input object below the mouse cursor. What would be the best way to do that?

- I'm not sure how I feel about this. There's a lot of friction involving entering brush mode and leaving it to gain access to the left mouse button. This feels especially bad when we have nothing in the clipboard and left mouse button doesn't do anything at all. - Solution: Brush Mode should contain a field that tracks a creation command. The user can press the keys we have set up now to change that field. - Should probably turn Brush Mode into a behavior. - For later consideration, we could have a "diret insertion" mode that replicates the behavior seen as of this commit.

MikiraSora · 2024-10-21T02:16:34Z

It shouldn't continue to be called BrushMode, because there are too many operations to memorize.
Maybe we can just combine all these functions, including BrushMode, into a new name, BatchMode.
Then the original mode could be called NormalMode, so that new users can quickly get started in this mode, and users who need more operations can use BatchMode.

Are you okay with implementing brush mode as a Behavior?

I haven't delved much into the full functionality of WPF, so this implementation requires me to understand it before I can draw conclusions

Any other keybinds I should add to brush mode?

None at the moment, but I would suggest that this needs to be compatible with the Keybinding feature, as users may need to modify the shortcuts to make it easier for them to use them.

I wanted to add a "preview" of the input object below the mouse cursor. What would be the best way to do that?

I do have an idea, is that the user's current pointer operation can be displayed near the pointer, for example, in your demonstration of the function #Deleting input object, when the user presses and holds the pointer and drags it, the words “Deletion of objects within the range” will be displayed near the pointer to indicate that
I'll try to make a prototype of this feature when I get around to it.

Anyway, it's not recommended to merge this PR yet, need to wait for me to finish the keybinding feature first, sorry, but it's coming soon!

MikiraSora · 2024-10-21T02:19:35Z

OngekiFumenEditor/Modules/FumenVisualEditor/Behaviors/BrushMode/BrushModeBehavior.cs

+            [Key.D4] = new BrushModeInputWallRight(),
+            [Key.D5] = new BrushModeInputLaneColorful(),
+            [Key.T] = new BrushModeInputTap(),
+            [Key.D] = new BrushModeInputHold(),


The H key should be assigned here

zacharied · 2024-10-23T01:42:30Z

I will rename "Brush Mode" to "Batch Mode" and add new keybindings called KBD_Batch_AddTap, KBD_Batch_AddHold, etc.

Also implement a "layer" system for keybindings. Keybindings are allowed to conflict with each other if they are on different layers, unless one of them is on Global.

zacharied · 2024-10-23T20:01:40Z

Batch Mode requires its own set of keybindings, separate from the normal ones. So I have started to make a "layer" system.

There are three layers, Global, Normal, and Batch. Keybindings in Normal are allowed to conflict with keybindings from Batch mode.

Global keybinds are always active.
Normal keybinds are detached when Batch mode is enabled.
Batch keybinds are attached when Batch mode is enabled.

For keybindings such as FastAddConnectableChild, I want to be accessible in Batch mode. So, I will make the Layers into a Flag, and each KeyBindingDefinition can have multiple layers.

The only object that takes two modifiers is Flick, and we don't care about the selection when adding flicks.

zacharied · 2024-10-24T05:22:18Z

I used the feature a lot and made some changes.

InputObjects are now referred to as "Submodes". There are two types of submodes. They determine what is done when clicking.

InputObjectSubmode: Clicking creates new objects
FilterObjectSubmode: Clicking selects objects like in Normal Mode, but only certain types are selected

A new icon is displayed when in a FilterObjectSubmode.

The filters are:

FloatingObject: selects bells, bullets, & flicks
DockableObject: selects taps & holds
Lane: selects lanes & walls

Documentation

Default keybinds

✏️: InputSubmode
🔎: FilterSubmode

Key	Action
Tilde	✏️WallLeft
1	✏️LaneLeft
2	✏️LaneCenter
3	✏️LaneRight
4	✏️WallRight
5	✏️LaneColorful
6	🔎Lanes
E	✏️Bell
T	✏️ Tap
H	✏️Hold
F	✏️Flick
Z	✏️LaneBlock
V	✏️Clipboard
Y	🔎Dockable Objects
U	🔎Floating Objects

These tables describe the behavior when clicking with different modifiers in Batch Mode.

Left click operations

Modifier	InputObject	FilterObject
None	Lane, hold, LaneBlock: Place object and select Tap, flick, bell, bullet: Place object	Drag to select filtered object
Alt	Normal mode selection	Normal mode selection
Shift	Lanes & holds: Place object (keep current selection) Flick & Lane block: Place object (change direction) Others: same as None	Drag to select filtered object (keep current selection)
Ctrl	Taps, holds, & flicks: Place object (critical)	Same as None
Ctrl+Alt	Drag to select only input object	Same as None

Right click operations

Modifier	InputObject	FilterObject
None	Clipboard: Nothing Others: Drag to delete input object	Drag to delete filtered object
Alt	Drag to delete all objects	Drag to delete all objects
Shift	Same as None	Same as None
Ctrl	Same as None	Same as None
Ctrl+Alt	Same as None	Same as None

TODO

Some right click behavior is buggy
Finish renaming classes BrushMode → BatchMode
Test

MikiraSora · 2024-10-28T00:36:29Z

at fad1143 KeyboardAction_DeleteSelectingObjects()
Here I used a new implementation to fix the problem

QQ20241028-15741-HD.mp4

But I see that you're deleting objects elsewhere as well, so I'd suggest that you need to follow up on that as well

zacharied · 2024-10-28T01:13:17Z

Thanks, I will follow your code for the other deletion functions

zacharied · 2024-10-28T01:16:13Z

Could you merge fad1143 into this PR? So i don't have to duplicate your deletion code.

…ekiFumenEditor into batch_mode

MikiraSora · 2024-10-28T01:26:09Z

Could you merge fad1143 into this PR? So i don't have to duplicate your deletion code.

how , I merged your current work and push to batch_mode in my repo

zacharied · 2024-10-28T01:26:32Z

Oh, i can do it myself, sorry

…nflict timesigntures

…ekiFumenEditor into batch_mode

zacharied · 2024-10-29T21:20:05Z

Crash when clicking on LaneBlock in batch mode:

----------Exception Catcher----------
Program notice a (unhandled) exception from object: System.Windows.Threading.Dispatcher(System.Windows.Threading.Dispatcher)

Exception lv.0 : Unable to cast object of type 'OngekiFumenEditor.Base.OngekiObjects.LaneBlockArea' to type 'OngekiFumenEditor.Base.OngekiMovableObjectBase'.
Stack :    at OngekiFumenEditor.Modules.FumenVisualEditor.ViewModels.FumenVisualEditorViewModel.<>c__DisplayClass292_0.<GetConflictingObject>b__0(IDisplayableObject x)
   at System.Linq.Enumerable.TryGetFirst[TSource](IEnumerable`1 source, Func`2 predicate, Boolean& found)
   at OngekiFumenEditor.Modules.FumenVisualEditor.Behaviors.BatchMode.BatchModeBehavior.PerformBrush(BatchModeInputSubmode submode)
   at OngekiFumenEditor.Modules.FumenVisualEditor.Behaviors.BatchMode.BatchModeBehavior.MouseUp(MouseButtonEventArgs args)
   at Microsoft.Xaml.Behaviors.TriggerBase.InvokeActions(Object parameter) in D:\a\_work\1\s\src\Microsoft.Xaml.Behaviors\TriggerBase.cs:line 153
   at System.Windows.RoutedEventArgs.InvokeHandler(Delegate handler, Object target)
   at System.Windows.EventRoute.InvokeHandlersImpl(Object source, RoutedEventArgs args, Boolean reRaised)
   at System.Windows.UIElement.RaiseEventImpl(DependencyObject sender, RoutedEventArgs args)
   at System.Windows.UIElement.RaiseTrustedEvent(RoutedEventArgs args)
   at System.Windows.Input.InputManager.ProcessStagingArea()
   at System.Windows.Interop.HwndMouseInputProvider.ReportInput(IntPtr hwnd, InputMode mode, Int32 timestamp, RawMouseActions actions, Int32 x, Int32 y, Int32 wheel)
   at System.Windows.Interop.HwndMouseInputProvider.FilterMessage(IntPtr hwnd, WindowMessage msg, IntPtr wParam, IntPtr lParam, Boolean& handled)
   at System.Windows.Interop.HwndSource.InputFilterMessage(IntPtr hwnd, Int32 msg, IntPtr wParam, IntPtr lParam, Boolean& handled)
   at System.Windows.Threading.ExceptionWrapper.InternalRealCall(Delegate callback, Object args, Int32 numArgs)
   at System.Windows.Threading.ExceptionWrapper.TryCatchWhen(Object source, Delegate callback, Object args, Int32 numArgs, Delegate catchHandler)
----------------------------

zacharied · 2024-10-29T23:10:17Z

I'm noticing this bug starting today, was it one of the recent commits?

Bottom green object is a TAP and top green object is a HOLD.

OngekiFumenEditor_XaJFbZp3ZQ.mp4

MikiraSora · 2024-10-29T23:58:20Z

I'm noticing this bug starting today, was it one of the recent commits?

Bottom green object is a TAP and top green object is a HOLD.

OngekiFumenEditor_XaJFbZp3ZQ.mp4

fixed and plz pull

MikiraSora · 2024-10-30T00:00:27Z

Crash when clicking on LaneBlock in batch mode:

----------Exception Catcher----------
Program notice a (unhandled) exception from object: System.Windows.Threading.Dispatcher(System.Windows.Threading.Dispatcher)

Exception lv.0 : Unable to cast object of type 'OngekiFumenEditor.Base.OngekiObjects.LaneBlockArea' to type 'OngekiFumenEditor.Base.OngekiMovableObjectBase'.
Stack :    at OngekiFumenEditor.Modules.FumenVisualEditor.ViewModels.FumenVisualEditorViewModel.<>c__DisplayClass292_0.<GetConflictingObject>b__0(IDisplayableObject x)
   at System.Linq.Enumerable.TryGetFirst[TSource](IEnumerable`1 source, Func`2 predicate, Boolean& found)
   at OngekiFumenEditor.Modules.FumenVisualEditor.Behaviors.BatchMode.BatchModeBehavior.PerformBrush(BatchModeInputSubmode submode)
   at OngekiFumenEditor.Modules.FumenVisualEditor.Behaviors.BatchMode.BatchModeBehavior.MouseUp(MouseButtonEventArgs args)
   at Microsoft.Xaml.Behaviors.TriggerBase.InvokeActions(Object parameter) in D:\a\_work\1\s\src\Microsoft.Xaml.Behaviors\TriggerBase.cs:line 153
   at System.Windows.RoutedEventArgs.InvokeHandler(Delegate handler, Object target)
   at System.Windows.EventRoute.InvokeHandlersImpl(Object source, RoutedEventArgs args, Boolean reRaised)
   at System.Windows.UIElement.RaiseEventImpl(DependencyObject sender, RoutedEventArgs args)
   at System.Windows.UIElement.RaiseTrustedEvent(RoutedEventArgs args)
   at System.Windows.Input.InputManager.ProcessStagingArea()
   at System.Windows.Interop.HwndMouseInputProvider.ReportInput(IntPtr hwnd, InputMode mode, Int32 timestamp, RawMouseActions actions, Int32 x, Int32 y, Int32 wheel)
   at System.Windows.Interop.HwndMouseInputProvider.FilterMessage(IntPtr hwnd, WindowMessage msg, IntPtr wParam, IntPtr lParam, Boolean& handled)
   at System.Windows.Interop.HwndSource.InputFilterMessage(IntPtr hwnd, Int32 msg, IntPtr wParam, IntPtr lParam, Boolean& handled)
   at System.Windows.Threading.ExceptionWrapper.InternalRealCall(Delegate callback, Object args, Int32 numArgs)
   at System.Windows.Threading.ExceptionWrapper.TryCatchWhen(Object source, Delegate callback, Object args, Int32 numArgs, Delegate catchHandler)
----------------------------

LaneBlockArea no X axis to move so it's actual not a OngekiMovableObjectBase
OngekiMovableObjectBase means its has X/Y axis to move.

zacharied · 2024-10-30T04:43:30Z

LaneBlockArea no X axis to move so it's actual not a OngekiMovableObjectBase OngekiMovableObjectBase means its has X/Y axis to move.

Thank you, i should have mentioned i fixed it with db8b813

…binds

zacharied added 9 commits October 12, 2024 18:41

Add PageUp & PageDown bindings

7c7924c

Add ctrl+wheel to change vertical scale

73242fc

Add keybinds for creating lanes in brush mode

c0c076e

Super brush mode

6075af2

Remove BrushMode variable

a0ad474

Restore old hotkeys

d6c73c0

Restore old numerical keybinds

2cd4afe

Bug and behavior fixes

bac9783

zacharied marked this pull request as draft October 20, 2024 18:42

zacharied added 2 commits October 20, 2024 14:43

Keep curve control binding in brush mode

f86f436

Revert unrelated control changes

635da60

MikiraSora reviewed Oct 21, 2024

View reviewed changes

MikiraSora mentioned this pull request Oct 23, 2024

Localize keybinds branch #19

Merged

zacharied added 2 commits October 23, 2024 13:41

Merge branch 'master' into feat.more-keybinds

6349818

Add bindings for Batch mode

41880e7

Also implement a "layer" system for keybindings. Keybindings are allowed to conflict with each other if they are on different layers, unless one of them is on Global.

Change Alt modifiers to Shift

74efb82

The only object that takes two modifiers is Flick, and we don't care about the selection when adding flicks.

zacharied and others added 8 commits October 24, 2024 01:49

Implement left click operations

83d8e6d

add ColorfulLaneBrightnessCheckRule

887c150

Fix right click behavior

525712b

Rename BrushMode to BatchMode in code

5c72344

Rename BrushMode to BatchMode in resources

bff858d

Fix Windows playing noise when toggling batch mode

36c91ca

Update Resources.Designer.cs

413325c

Merge remote-tracking branch 'upstream/master' into feat.more-keybinds

180b803

zacharied marked this pull request as ready for review October 24, 2024 23:21

Code cleanup

8000550

Merge branch 'feat.more-keybinds' of https://github.com/zacharied/Ong…

ff6ee4d

…ekiFumenEditor into batch_mode

zacharied and others added 15 commits October 27, 2024 21:46

Use new deletion function

fb01734

rename SvgGenerateOption

ae46db4

KeyBindingDefinition add DisplayName

e178576

add KeyboardAction_ChangeDockableLaneType

592ba78

fix UpdateCachedAllTimeSignatureUniformPositionList() when resolve co…

97cc4a1

…nflict timesigntures

add CollectionHelper.MergeTwoSortedCollections for 0391

2d9c749

GetCalculatableEvents() use CollectionHelper.MergeTwoSortedCollections()

bcd7a85

Fix broken brush button TL

a9c996b

refactory CheckIfSoflanChanged2() use while()

1541f8a

optimze outVertices

c4d3f4d

Merge branch 'feat.more-keybinds' of https://github.com/zacharied/Ong…

c4df6ec

…ekiFumenEditor into batch_mode

use MoveObjectTo() when adding curve control object

e341611

fix bugs

9470833

refactory string rendering shader

885ab3d

we needn't switch shader program always

334db5c

zacharied added 2 commits October 29, 2024 17:27

Update Designer.cs

760eef8

Fix crash when selecting TimelineObjects in batch mode

db8b813

Merge remote-tracking branch 'upstream/batch_mode' into feat.more-key…

bbaaf7b

…binds

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enhanced brush mode #17

Enhanced brush mode #17

zacharied commented Oct 20, 2024 •

edited

Loading

MikiraSora commented Oct 21, 2024 •

edited

Loading

MikiraSora Oct 21, 2024

zacharied commented Oct 23, 2024

zacharied commented Oct 23, 2024

zacharied commented Oct 24, 2024 •

edited

Loading

MikiraSora commented Oct 28, 2024

zacharied commented Oct 28, 2024

zacharied commented Oct 28, 2024 •

edited

Loading

MikiraSora commented Oct 28, 2024

zacharied commented Oct 28, 2024

zacharied commented Oct 29, 2024

zacharied commented Oct 29, 2024 •

edited

Loading

MikiraSora commented Oct 29, 2024

MikiraSora commented Oct 30, 2024

zacharied commented Oct 30, 2024

Enhanced brush mode #17

Are you sure you want to change the base?

Enhanced brush mode #17

Conversation

zacharied commented Oct 20, 2024 • edited Loading

TODO

Brush mode improvements

Changing input object

Insert input object

Deleting input object

Change selection

Questions

MikiraSora commented Oct 21, 2024 • edited Loading

MikiraSora Oct 21, 2024

Choose a reason for hiding this comment

zacharied commented Oct 23, 2024

zacharied commented Oct 23, 2024

zacharied commented Oct 24, 2024 • edited Loading

Documentation

Default keybinds

Left click operations

Right click operations

TODO

MikiraSora commented Oct 28, 2024

zacharied commented Oct 28, 2024

zacharied commented Oct 28, 2024 • edited Loading

MikiraSora commented Oct 28, 2024

zacharied commented Oct 28, 2024

zacharied commented Oct 29, 2024

zacharied commented Oct 29, 2024 • edited Loading

MikiraSora commented Oct 29, 2024

MikiraSora commented Oct 30, 2024

zacharied commented Oct 30, 2024

zacharied commented Oct 20, 2024 •

edited

Loading

MikiraSora commented Oct 21, 2024 •

edited

Loading

zacharied commented Oct 24, 2024 •

edited

Loading

zacharied commented Oct 28, 2024 •

edited

Loading

zacharied commented Oct 29, 2024 •

edited

Loading