Finish Implementing Input Settings Menu

assets/locales/en-US/main.ftl

@@ -16,6 +16,7 @@ main-menu = Main Menu
 # Settings Menu
 controls = Controls
 sound = Sound
+reset = Reset
 
 # Controls
 action = Action
@@ -28,4 +29,5 @@ move-left = Move Left
 move-right = Move Right
 flop-attack = Flop Attack
 shoot = Shoot
-throw = Throw
+throw = Throw
+bind-input = Make an input to bind or press Escape to cancel.

src/main.rs

@@ -14,6 +14,7 @@ use enemy::*;
 use input::MenuAction;
 use iyes_loopless::prelude::*;
 use leafwing_input_manager::prelude::*;
+use platform::Storage;
 use player::*;
 use rand::{seq::SliceRandom, Rng};
 
@@ -61,6 +62,7 @@ use crate::{
     attack::{attack_cleanup, attack_tick},
     config::EngineConfig,
     input::PlayerAction,
+    metadata::Settings,
 };
 
 #[cfg_attr(feature = "debug", derive(bevy_inspector_egui::Inspectable))]
@@ -199,6 +201,7 @@ fn main() {
         .add_plugin(RapierPhysicsPlugin::<NoUserData>::pixels_per_meter(100.0))
         .add_plugin(InputManagerPlugin::<PlayerAction>::default())
         .add_plugin(InputManagerPlugin::<MenuAction>::default())
+        .insert_resource(ToggleActions::<MenuAction>::default())
         .add_plugin(AttackPlugin)
         .add_plugin(AnimationPlugin)
         .add_plugin(StatePlugin)
@@ -325,6 +328,7 @@ fn load_level(
     asset_server: Res<AssetServer>,
     game: Res<GameMeta>,
     windows: Res<Windows>,
+    mut storage: ResMut<Storage>,
 ) {
     if let Some(level) = assets.get(level_handle.clone_weak()) {
         debug!("Loaded level");
@@ -340,7 +344,12 @@ fn load_level(
 
         // Spawn the players
         for (i, player) in level.players.iter().enumerate() {
-            commands.spawn_bundle(PlayerBundle::new(player, i, &game));
+            commands.spawn_bundle(PlayerBundle::new(
+                player,
+                i,
+                &game,
+                storage.get(Settings::STORAGE_KEY).as_ref(),
+            ));
         }
 
         // Spawn the enemies

src/player.rs

@@ -5,7 +5,7 @@ use crate::{
     animation::Facing,
     consts,
     input::PlayerAction,
-    metadata::{FighterMeta, FighterSpawnMeta, GameMeta},
+    metadata::{FighterMeta, FighterSpawnMeta, GameMeta, Settings},
 };
 
 #[derive(Component)]
@@ -23,7 +23,12 @@ pub struct PlayerBundle {
 }
 
 impl PlayerBundle {
-    pub fn new(player_meta: &FighterSpawnMeta, player_i: usize, game_meta: &GameMeta) -> Self {
+    pub fn new(
+        player_meta: &FighterSpawnMeta,
+        player_i: usize,
+        game_meta: &GameMeta,
+        settings: Option<&Settings>,
+    ) -> Self {
         let ground_offset = Vec3::new(0.0, consts::GROUND_Y, 0.0);
         let player_pos = player_meta.location + ground_offset;
 
@@ -33,8 +38,8 @@ impl PlayerBundle {
         let fighter_handle = player_meta.fighter_handle.clone();
 
         let input_manager_bundle = InputManagerBundle {
-            input_map: game_meta
-                .default_settings
+            input_map: settings
+                .unwrap_or(&game_meta.default_settings)
                 .player_controls
                 .get_input_map(player_i),
             ..default()

src/ui.rs

@@ -1,7 +1,7 @@
 use bevy::{prelude::*, utils::HashMap, window::WindowId};
 use bevy_egui::{egui, EguiContext, EguiInput, EguiPlugin, EguiSettings};
 use iyes_loopless::prelude::*;
-use leafwing_input_manager::prelude::ActionState;
+use leafwing_input_manager::{plugin::ToggleActions, prelude::ActionState};
 
 use crate::{assets::EguiFont, input::MenuAction, metadata::GameMeta, GameState};
 
@@ -116,13 +116,18 @@ impl<'a> WidgetAdjacencyEntry<'a> {
 fn handle_menu_input(
     mut windows: ResMut<Windows>,
     input: Query<&ActionState<MenuAction>>,
+    input_toggle: Res<ToggleActions<MenuAction>>,
     mut egui_inputs: ResMut<HashMap<WindowId, EguiInput>>,
     adjacencies: Res<WidgetAdjacencies>,
     mut egui_ctx: ResMut<EguiContext>,
 ) {
     use bevy::window::WindowMode;
     let input = input.single();
 
+    if !input_toggle.enabled {
+        return;
+    }
+
     // Handle fullscreen toggling
     if input.just_pressed(MenuAction::ToggleFullscreen) {
         if let Some(window) = windows.get_primary_mut() {