From c2b64adbc7acdbd64a4fc237346187885caf2573 Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Wed, 12 Aug 2026 19:34:42 +0000 Subject: [PATCH] remove rumble flag, just try to rumble (#1185) --- src/ui.rs | 4 ---- src/ui/input.rs | 28 ---------------------------- 2 files changed, 32 deletions(-) diff --git a/src/ui.rs b/src/ui.rs index 36ee8c1..47bede5 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -192,28 +192,24 @@ impl Ui { input::Controllers { game_controller: std::ptr::null_mut(), joystick: std::ptr::null_mut(), - rumble: false, guid: sdl3_sys::guid::SDL_GUID::default(), last_key_state: 0, }, input::Controllers { game_controller: std::ptr::null_mut(), joystick: std::ptr::null_mut(), - rumble: false, guid: sdl3_sys::guid::SDL_GUID::default(), last_key_state: 0, }, input::Controllers { game_controller: std::ptr::null_mut(), joystick: std::ptr::null_mut(), - rumble: false, guid: sdl3_sys::guid::SDL_GUID::default(), last_key_state: 0, }, input::Controllers { game_controller: std::ptr::null_mut(), joystick: std::ptr::null_mut(), - rumble: false, guid: sdl3_sys::guid::SDL_GUID::default(), last_key_state: 0, }, diff --git a/src/ui/input.rs b/src/ui/input.rs index 3cd49f1..5cab30d 100644 --- a/src/ui/input.rs +++ b/src/ui/input.rs @@ -11,7 +11,6 @@ pub const UNKNOWN_CONTROLLER_NAME: &str = "Unknown controller"; #[derive(Default)] pub struct Controllers { - pub rumble: bool, pub game_controller: *mut sdl3_sys::gamepad::SDL_Gamepad, pub joystick: *mut sdl3_sys::joystick::SDL_Joystick, pub guid: sdl3_sys::guid::SDL_GUID, @@ -215,9 +214,6 @@ fn set_buttons( } pub fn set_rumble(ui: &ui::Ui, channel: usize, rumble: u8) { - if !ui.input.controllers[channel].rumble { - return; - } let controller = ui.input.controllers[channel].game_controller; let joystick = ui.input.controllers[channel].joystick; if !controller.is_null() { @@ -598,18 +594,6 @@ pub fn init(ui: &mut ui::Ui) { ui.input.controllers[i].game_controller = gamepad; ui.input.controllers[i].guid = unsafe { sdl3_sys::gamepad::SDL_GetGamepadGUIDForID(joystick_id) }; - let properties = - unsafe { sdl3_sys::gamepad::SDL_GetGamepadProperties(gamepad) }; - if properties == 0 { - eprintln!("could not get gamepad properties"); - } - ui.input.controllers[i].rumble = unsafe { - sdl3_sys::properties::SDL_GetBooleanProperty( - properties, - sdl3_sys::gamepad::SDL_PROP_GAMEPAD_CAP_RUMBLE_BOOLEAN, - false, - ) - }; } } else { let joystick = unsafe { sdl3_sys::joystick::SDL_OpenJoystick(joystick_id) }; @@ -619,18 +603,6 @@ pub fn init(ui: &mut ui::Ui) { ui.input.controllers[i].joystick = joystick; ui.input.controllers[i].guid = unsafe { sdl3_sys::joystick::SDL_GetJoystickGUIDForID(joystick_id) }; - let properties = - unsafe { sdl3_sys::joystick::SDL_GetJoystickProperties(joystick) }; - if properties == 0 { - eprintln!("could not get joystick properties"); - } - ui.input.controllers[i].rumble = unsafe { - sdl3_sys::properties::SDL_GetBooleanProperty( - properties, - sdl3_sys::joystick::SDL_PROP_JOYSTICK_CAP_RUMBLE_BOOLEAN, - false, - ) - }; } } } else {