From eb5d255fd7c98808c0df8314a8c06e3662291e8f Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Thu, 12 Jun 2025 13:34:59 +0200 Subject: [PATCH] move get_controller_names --- src/main.rs | 4 ++-- src/ui/gui.rs | 13 ------------- src/ui/input.rs | 13 +++++++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main.rs b/src/main.rs index 8544b58..9cafd97 100644 --- a/src/main.rs +++ b/src/main.rs @@ -111,7 +111,7 @@ async fn main() { } } if args.list_controllers { - let controllers = gui::get_controller_names(&ui); + let controllers = ui::input::get_controller_names(&ui); for (i, controller) in controllers.iter().enumerate() { println!("Controller {}: {}", i, controller); } @@ -183,7 +183,7 @@ async fn main() { { let game_ui = ui::Ui::new(); controllers_paths = gui::get_controller_paths(&game_ui); - controller_names = gui::get_controller_names(&game_ui); + controller_names = ui::input::get_controller_names(&game_ui); } eframe::run_native( "gopher64", diff --git a/src/ui/gui.rs b/src/ui/gui.rs index 3382c03..159fb85 100644 --- a/src/ui/gui.rs +++ b/src/ui/gui.rs @@ -58,19 +58,6 @@ fn get_input_profiles(config: &ui::config::Config) -> Vec { profiles } -pub fn get_controller_names(game_ui: &ui::Ui) -> Vec { - let mut controllers: Vec = vec![]; - - for joystick in game_ui.input.joysticks.iter() { - let name = unsafe { - std::ffi::CStr::from_ptr(sdl3_sys::joystick::SDL_GetJoystickNameForID(*joystick)) - }; - controllers.push(name.to_string_lossy().to_string()); - } - - controllers -} - pub fn get_controller_paths(game_ui: &ui::Ui) -> Vec { let mut controller_paths: Vec = vec![]; diff --git a/src/ui/input.rs b/src/ui/input.rs index c9fc879..6ae870c 100644 --- a/src/ui/input.rs +++ b/src/ui/input.rs @@ -334,6 +334,19 @@ fn change_paks( pressed } +pub fn get_controller_names(game_ui: &ui::Ui) -> Vec { + let mut controllers: Vec = vec![]; + + for joystick in game_ui.input.joysticks.iter() { + let name = unsafe { + std::ffi::CStr::from_ptr(sdl3_sys::joystick::SDL_GetJoystickNameForID(*joystick)) + }; + controllers.push(name.to_string_lossy().to_string()); + } + + controllers +} + pub fn get(ui: &ui::Ui, channel: usize) -> InputData { let profile_name = ui.config.input.input_profile_binding[channel].clone(); let profile = ui.config.input.input_profiles.get(&profile_name).unwrap();