pbwraith/gopher64-netplay
Archived
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

remove rumble flag, just try to rumble (#1185)

Browse Source
This commit is contained in:
Logan McNaughton 2026-08-12 19:34:42 +00:00 committed by GitHub
parent efe78e544a
commit c2b64adbc7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui.rs
View File

@ -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,
},

28
src/ui/input.rs
View File

@ -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 {