mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-20 18:13:22 +02:00
Merge pull request #8847 from german77/stop
input_common: sdl: Always check for motion on reconnect
This commit is contained in:
commit
dd2faab372
@ -40,13 +40,13 @@ public:
|
|||||||
void EnableMotion() {
|
void EnableMotion() {
|
||||||
if (sdl_controller) {
|
if (sdl_controller) {
|
||||||
SDL_GameController* controller = sdl_controller.get();
|
SDL_GameController* controller = sdl_controller.get();
|
||||||
if (SDL_GameControllerHasSensor(controller, SDL_SENSOR_ACCEL) && !has_accel) {
|
has_accel = SDL_GameControllerHasSensor(controller, SDL_SENSOR_ACCEL);
|
||||||
|
has_gyro = SDL_GameControllerHasSensor(controller, SDL_SENSOR_GYRO);
|
||||||
|
if (has_accel) {
|
||||||
SDL_GameControllerSetSensorEnabled(controller, SDL_SENSOR_ACCEL, SDL_TRUE);
|
SDL_GameControllerSetSensorEnabled(controller, SDL_SENSOR_ACCEL, SDL_TRUE);
|
||||||
has_accel = true;
|
|
||||||
}
|
}
|
||||||
if (SDL_GameControllerHasSensor(controller, SDL_SENSOR_GYRO) && !has_gyro) {
|
if (has_gyro) {
|
||||||
SDL_GameControllerSetSensorEnabled(controller, SDL_SENSOR_GYRO, SDL_TRUE);
|
SDL_GameControllerSetSensorEnabled(controller, SDL_SENSOR_GYRO, SDL_TRUE);
|
||||||
has_gyro = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -305,6 +305,7 @@ void SDLDriver::InitJoystick(int joystick_index) {
|
|||||||
auto joystick = std::make_shared<SDLJoystick>(guid, 0, sdl_joystick, sdl_gamecontroller);
|
auto joystick = std::make_shared<SDLJoystick>(guid, 0, sdl_joystick, sdl_gamecontroller);
|
||||||
PreSetController(joystick->GetPadIdentifier());
|
PreSetController(joystick->GetPadIdentifier());
|
||||||
SetBattery(joystick->GetPadIdentifier(), joystick->GetBatteryLevel());
|
SetBattery(joystick->GetPadIdentifier(), joystick->GetBatteryLevel());
|
||||||
|
joystick->EnableMotion();
|
||||||
joystick_map[guid].emplace_back(std::move(joystick));
|
joystick_map[guid].emplace_back(std::move(joystick));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -316,6 +317,7 @@ void SDLDriver::InitJoystick(int joystick_index) {
|
|||||||
|
|
||||||
if (joystick_it != joystick_guid_list.end()) {
|
if (joystick_it != joystick_guid_list.end()) {
|
||||||
(*joystick_it)->SetSDLJoystick(sdl_joystick, sdl_gamecontroller);
|
(*joystick_it)->SetSDLJoystick(sdl_joystick, sdl_gamecontroller);
|
||||||
|
(*joystick_it)->EnableMotion();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -323,6 +325,7 @@ void SDLDriver::InitJoystick(int joystick_index) {
|
|||||||
auto joystick = std::make_shared<SDLJoystick>(guid, port, sdl_joystick, sdl_gamecontroller);
|
auto joystick = std::make_shared<SDLJoystick>(guid, port, sdl_joystick, sdl_gamecontroller);
|
||||||
PreSetController(joystick->GetPadIdentifier());
|
PreSetController(joystick->GetPadIdentifier());
|
||||||
SetBattery(joystick->GetPadIdentifier(), joystick->GetBatteryLevel());
|
SetBattery(joystick->GetPadIdentifier(), joystick->GetBatteryLevel());
|
||||||
|
joystick->EnableMotion();
|
||||||
joystick_guid_list.emplace_back(std::move(joystick));
|
joystick_guid_list.emplace_back(std::move(joystick));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user