Input Settings Menu #100

zicklag · 2022-07-16T15:48:38Z

It's working!

Opening as a draft because I need to do a self-review, but it's functional. 🎉

zicklag · 2022-07-17T02:06:35Z

Cargo.toml

@@ -22,7 +23,7 @@ getrandom = { version = "0.2", features = ["js"] }
 bevy_mod_debugdump = { version = "0.4", optional = true }
 bevy-inspector-egui = { version = "0.11", optional = true }
 bevy-inspector-egui-rapier = { version = "0.4", optional = true, features = ["rapier2d"] }
-leafwing_input_manager = { git = "https://github.com/Leafwing-Studios/leafwing-input-manager.git", rev = "e8bd6e0" }
+leafwing_input_manager = { git = "https://github.com/zicklag/leafwing-input-manager.git", branch = "backport-leafwing-dev-to-bevy-0.7" }


Note: Because I had to make a fix to leafwing, and they've already migrated to the pending bevy 0.8, there's no way around using my temporary fork for this anymore. I think we'll just have to wait 'till we migrate to Bevy 0.8 to switch this to a more permanent release.

To get my fix in, I had to apply it to their latest dev branch, then backport the dev branch to Bevy 0.7.

zicklag · 2022-07-17T15:59:17Z

Just did a more thorough review of my own code: added lots of comments, removed some unneeded code paths, and fixed a minor usability issue with button hovering and focusing. I think this is ready now.

odecay · 2022-07-18T05:26:07Z

Gonna try to review this tomorrow.

One thing to consider for a future pr is a "bind all" mode which when entered prompts for input to bind for the first Action on list, then immediately progresses to the next Action after pressing a key/button until all actions are bound to buttons.

64kramsystem · 2022-07-18T22:22:11Z

Going to give a review as well tomorrow or the day after, as I'm about to travel 😄

- Simplify Controls Metadata and Move to Settings - Remove camera controls - Update leafwing input manager to get support for virtual dpads with axes in them.

This allows us to say how widgets should be navigated when pressing directions on the gamepad or keyboard.

This makes sure that you can still use keyboard/gamepad navigation, even if the mouse is idling over a button.

odecay

Looks good! I didn't have much meaningful feedback, noticed few small things that looked like spelling errors.

None of this should block this work or be included in this pr but some thoughts came up while looking it over.

I think maybe we will want to think more about what options players have for binding in the menu, I feel like maybe it should allow for selecting an input type and then only showing a map for that type instead of gamepad + keyboard 1/2 at the same time.

This might also relate to how we expect bindings to work in multiplayer both in local multiplayer and networked multiplayer. Which player gets to set their bindings once the menu is triggered? Right now it sets for all players correct? (I haven't actually pulled and tried it out yet so I could very well be misinterpreting)

src/ui/extensions.rs

src/ui/main_menu.rs

Co-authored-by: odecay <[email protected]>

zicklag · 2022-07-19T14:20:56Z

noticed few small things that looked like spelling errors.

Good catch, I fixed those now. 👍

I feel like maybe it should allow for selecting an input type and then only showing a map for that type instead of gamepad + keyboard 1/2 at the same time.

That's a great idea. We could definitely do that in a next iteration. It would be an easy update.

This might also relate to how we expect bindings to work in multiplayer both in local multiplayer and networked multiplayer. Which player gets to set their bindings once the menu is triggered? Right now it sets for all players correct?

Yep. Every player shares the same gamepad bindings, and there are the two keyboard bindings so that you can play two players with one keyboard.

If we added a way to rotate through which bindings you are actually setting, like you mentioned, then that would make it easier to set different gamepad bindings for player 1 and player 2.

I'd have done separate gamepad bindings for both gamepads if it weren't for the fact that I ran out of room. :) Selecting which binding you are setting first solves a lot of problems.

odecay · 2022-07-19T17:52:44Z

noticed few small things that looked like spelling errors.

Good catch, I fixed those now. +1

I feel like maybe it should allow for selecting an input type and then only showing a map for that type instead of gamepad + keyboard 1/2 at the same time.

That's a great idea. We could definitely do that in a next iteration. It would be an easy update.

This might also relate to how we expect bindings to work in multiplayer both in local multiplayer and networked multiplayer. Which player gets to set their bindings once the menu is triggered? Right now it sets for all players correct?

Yep. Every player shares the same gamepad bindings, and there are the two keyboard bindings so that you can play two players with one keyboard.

If we added a way to rotate through which bindings you are actually setting, like you mentioned, then that would make it easier to set different gamepad bindings for player 1 and player 2.

I'd have done separate gamepad bindings for both gamepads if it weren't for the fact that I ran out of room. :) Selecting which binding you are setting first solves a lot of problems.

Yep all totally makes sense. Lets add an issue for next steps for input binding after we get this PR merged in. Feel free to merge whenever you feel its ready.

zicklag · 2022-07-19T18:02:26Z

Feel free to merge whenever you feel its ready.

Since nothing I'm doing next needs this I'll wait a day to let @64kramsystem look at it.

odecay · 2022-07-19T18:34:51Z

Feel free to merge whenever you feel its ready.

Since nothing I'm doing next needs this I'll wait a day to let @64kramsystem look at it.

What are you planning on working on next btw? I was thinking of starting to work on making the attacks defined via startup + active + recovery frames that correspond to when hitboxes are live. Which would implicate #53 and #54 but I saw you assigned yourself #54. Would you mind if I took that one?

zicklag · 2022-07-19T18:42:20Z

Would you mind if I took that one?

Oh, not at all, go ahead. That one looked easy and I was trying to find what the most important things to get out before the next release were, but I'd rather you took it anyway.

What are you planning on working on next btw?

Right now I'm working on a quick experiment to see if an idea I had regarding scripting is feasible or not.

I figured that if we have a solution for scripting, it might have an impact on how we program the players or items, so it'd be good to have some idea of what that might look like earlier rather than later.

It should just take a day or two to see if my idea has any merit, and it's kind of fun experimentation work so I figured I'd take a quick look as sort of a "break".

Then I'll come back to the #83 if nobody else wants it, or I'll just work on the update binding menu.

odecay · 2022-07-19T18:46:50Z

Would you mind if I took that one?

Oh, not at all, go ahead. That one looked easy and I was trying to find what the most important things to get out before the next release were, but I'd rather you took it anyway.

What are you planning on working on next btw?

Right now I'm working on a quick experiment to see if an idea I had regarding scripting is feasible or not.

I figured that if we have a solution for scripting, it might have an impact on how we program the players or items, so it'd be good to have some idea of what that might look like earlier rather than later.

It should just take a day or two to see if my idea has any merit, and it's kind of fun experimentation work so I figured I'd take a quick look as sort of a "break".

Then I'll come back to the #83 if nobody else wants it, or I'll just work on the update binding menu.

okay perfect! scripting sounds awesome, followed along with the threads/issues on mun scripting/bevy_mod_scripting, were you thinking something like #107?

zicklag · 2022-07-19T19:00:38Z

Replied here to make it more visible: #107 (comment)

64kramsystem · 2022-07-19T21:42:59Z

Feel free to merge whenever you feel its ready.

Since nothing I'm doing next needs this I'll wait a day to let @64kramsystem look at it.

Looks good to me (although I'm not very familiar with the areas 😬) 😄

64kramsystem

👍

odecay · 2022-07-19T22:01:10Z

Gettn it in then

zicklag force-pushed the input-settings branch from a523a54 to 2520978 Compare July 16, 2022 15:49

zicklag linked an issue Jul 16, 2022 that may be closed by this pull request

"Controller Settings" menu for editing input map. #87

Closed

This was referenced Jul 16, 2022

Remove orphan Panning component and related code #104

Merged

Sound Settings Menu #106

Open

zicklag force-pushed the input-settings branch from 2520978 to cd7e4cd Compare July 17, 2022 00:35

zicklag requested review from 64kramsystem and odecay July 17, 2022 02:07

zicklag marked this pull request as ready for review July 17, 2022 02:07

zicklag commented Jul 17, 2022

View reviewed changes

zicklag linked an issue Jul 17, 2022 that may be closed by this pull request

Camera panning and player move both happens if panning key combination includes the player move key #61

Closed

zicklag added 13 commits July 18, 2022 18:21

Split Main and Pause Menus Into Their Own Modules

caa4cf2

Add Doc Comment

39864b3

Establish Basic Settings Menu Structure

29c4271

Refactor Input System

b1d97fd

- Simplify Controls Metadata and Move to Settings - Remove camera controls - Update leafwing input manager to get support for virtual dpads with axes in them.

Add UI Widget Adjacency System

3b34b39

This allows us to say how widgets should be navigated when pressing directions on the gamepad or keyboard.

Almost Functional Input Bindings!

e98840f

Finish Implementing Input Settings Menu

43e1a06

Update Button Adjacencies and Hide Sound Tab

c1057b5

Tweak Input Binding Verbiage

1dd462b

Only Focus Buttons When Mouse Hovers _and_ Moves

b923b47

This makes sure that you can still use keyboard/gamepad navigation, even if the mouse is idling over a button.

Hide the Quit Button on Web Builds

47ba38a

Remove Unneeded Input Toggle Resource

21fb9a8

Add Comments, Improve Style, Remove Unneeded Code

fd0716e

zicklag force-pushed the input-settings branch from 60b68a9 to fd0716e Compare July 18, 2022 23:30

odecay reviewed Jul 19, 2022

View reviewed changes

src/ui/extensions.rs Outdated Show resolved Hide resolved

src/ui/main_menu.rs Outdated Show resolved Hide resolved

Fix Spelling Mistakes

59b9191

Co-authored-by: odecay <[email protected]>

64kramsystem approved these changes Jul 19, 2022

View reviewed changes

odecay merged commit f17b3c1 into fishfolk:master Jul 19, 2022

erlend-sh added this to the v0.0.3 milestone Jul 19, 2022

zicklag deleted the input-settings branch July 19, 2022 22:42

zicklag mentioned this pull request Jul 27, 2022

Improved Input Menu #163

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Input Settings Menu #100

Input Settings Menu #100

zicklag commented Jul 16, 2022

zicklag Jul 17, 2022 •

edited

Loading

zicklag commented Jul 17, 2022

odecay commented Jul 18, 2022

64kramsystem commented Jul 18, 2022

odecay left a comment •

edited

Loading

zicklag commented Jul 19, 2022 •

edited

Loading

odecay commented Jul 19, 2022

zicklag commented Jul 19, 2022

odecay commented Jul 19, 2022 •

edited

Loading

zicklag commented Jul 19, 2022 •

edited

Loading

odecay commented Jul 19, 2022

zicklag commented Jul 19, 2022

64kramsystem commented Jul 19, 2022

64kramsystem left a comment

odecay commented Jul 19, 2022

Input Settings Menu #100

Input Settings Menu #100

Conversation

zicklag commented Jul 16, 2022

zicklag Jul 17, 2022 • edited Loading

Choose a reason for hiding this comment

zicklag commented Jul 17, 2022

odecay commented Jul 18, 2022

64kramsystem commented Jul 18, 2022

odecay left a comment • edited Loading

Choose a reason for hiding this comment

zicklag commented Jul 19, 2022 • edited Loading

odecay commented Jul 19, 2022

zicklag commented Jul 19, 2022

odecay commented Jul 19, 2022 • edited Loading

zicklag commented Jul 19, 2022 • edited Loading

odecay commented Jul 19, 2022

zicklag commented Jul 19, 2022

64kramsystem commented Jul 19, 2022

64kramsystem left a comment

Choose a reason for hiding this comment

odecay commented Jul 19, 2022

zicklag Jul 17, 2022 •

edited

Loading

odecay left a comment •

edited

Loading

zicklag commented Jul 19, 2022 •

edited

Loading

odecay commented Jul 19, 2022 •

edited

Loading

zicklag commented Jul 19, 2022 •

edited

Loading