Skip to content

Commit

Permalink
refactor: rename 'input_action_map' to 'input_map'
Browse files Browse the repository at this point in the history
  • Loading branch information
ShenMian committed Apr 25, 2024
1 parent 0ff2f75 commit f1374cf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/input_action_map.rs → src/input_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pub enum Action {
ExportLevelToClipboard,
}

pub fn default_input_action_map() -> InputMap<Action> {
pub fn default_input_map() -> InputMap<Action> {
use leafwing_input_manager::user_input::InputKind::*;
let mouse_input_map = InputMap::new([
(
Expand Down
16 changes: 8 additions & 8 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ mod components;
mod database;
mod direction;
mod events;
mod input_action_map;
mod input_map;
mod level;
mod movement;
mod plugins;
Expand All @@ -18,7 +18,7 @@ mod test;
use bevy::prelude::*;
use bevy_kira_audio::prelude::*;
use events::*;
use input_action_map::*;
use input_map::*;
use leafwing_input_manager::prelude::*;
use level::*;
use plugins::performance_matrix::*;
Expand Down Expand Up @@ -46,15 +46,15 @@ fn load_config() -> Config {
config
}

fn load_input_action_map() -> InputMap<Action> {
fn load_input_map() -> InputMap<Action> {
const KEYMAP_FILE_PATH: &str = "keymap.toml";
if !Path::new(KEYMAP_FILE_PATH).is_file() {
let default_keymap_toml = toml::to_string(&default_input_action_map()).unwrap();
let default_keymap_toml = toml::to_string(&default_input_map()).unwrap();
fs::write(KEYMAP_FILE_PATH, default_keymap_toml).unwrap();
}
let keymap_toml = fs::read_to_string(KEYMAP_FILE_PATH).unwrap();
let input_action_map: InputMap<Action> = toml::from_str(keymap_toml.as_str()).unwrap();
input_action_map
let input_map: InputMap<Action> = toml::from_str(keymap_toml.as_str()).unwrap();
input_map
}

fn save_config(config: Res<Config>) {
Expand Down Expand Up @@ -163,9 +163,9 @@ fn main() {
.insert_resource(player_movement)
.insert_resource(AutoMoveState::default());

let input_action_map = load_input_action_map();
let input_map = load_input_map();
app.init_resource::<ActionState<Action>>()
.insert_resource(input_action_map);
.insert_resource(input_map);

app.add_event::<CrateEnterTarget>()
.add_event::<CrateLeaveTarget>()
Expand Down

0 comments on commit f1374cf

Please sign in to comment.