CyberGroup
/
yuzu
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4742 from german77/InputFilter 

HID: Only use inputs corresponding to controller type
This commit is contained in:
bunnei 2020-10-05 21:40:09 -07:00 committed by GitHub
parent de4cadca1f 2f47b27654
commit 614bd0ee8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/core/hle/service/hid/controllers/npad.cpp
View File

@ -260,7 +260,7 @@ void Controller_NPad::OnRelease() {}
void Controller_NPad::RequestPadStateUpdate(u32 npad_id) { void Controller_NPad::RequestPadStateUpdate(u32 npad_id) {
const auto controller_idx = NPadIdToIndex(npad_id); const auto controller_idx = NPadIdToIndex(npad_id);
[[maybe_unused]] const auto controller_type = connected_controllers[controller_idx].type; const auto controller_type = connected_controllers[controller_idx].type;
if (!connected_controllers[controller_idx].is_connected) { if (!connected_controllers[controller_idx].is_connected) {
return; return;
} }
@ -276,54 +276,63 @@ void Controller_NPad::RequestPadStateUpdate(u32 npad_id) {
analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)]->GetStatus(); analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)]->GetStatus();
using namespace Settings::NativeButton; using namespace Settings::NativeButton;
pad_state.a.Assign(button_state[A - BUTTON_HID_BEGIN]->GetStatus()); if (controller_type != NPadControllerType::JoyLeft) {
pad_state.b.Assign(button_state[B - BUTTON_HID_BEGIN]->GetStatus()); pad_state.a.Assign(button_state[A - BUTTON_HID_BEGIN]->GetStatus());
pad_state.x.Assign(button_state[X - BUTTON_HID_BEGIN]->GetStatus()); pad_state.b.Assign(button_state[B - BUTTON_HID_BEGIN]->GetStatus());
pad_state.y.Assign(button_state[Y - BUTTON_HID_BEGIN]->GetStatus()); pad_state.x.Assign(button_state[X - BUTTON_HID_BEGIN]->GetStatus());
pad_state.l_stick.Assign(button_state[LStick - BUTTON_HID_BEGIN]->GetStatus()); pad_state.y.Assign(button_state[Y - BUTTON_HID_BEGIN]->GetStatus());
pad_state.r_stick.Assign(button_state[RStick - BUTTON_HID_BEGIN]->GetStatus()); pad_state.r_stick.Assign(button_state[RStick - BUTTON_HID_BEGIN]->GetStatus());
pad_state.l.Assign(button_state[L - BUTTON_HID_BEGIN]->GetStatus()); pad_state.r.Assign(button_state[R - BUTTON_HID_BEGIN]->GetStatus());
pad_state.r.Assign(button_state[R - BUTTON_HID_BEGIN]->GetStatus()); pad_state.zr.Assign(button_state[ZR - BUTTON_HID_BEGIN]->GetStatus());
pad_state.zl.Assign(button_state[ZL - BUTTON_HID_BEGIN]->GetStatus()); pad_state.plus.Assign(button_state[Plus - BUTTON_HID_BEGIN]->GetStatus());
pad_state.zr.Assign(button_state[ZR - BUTTON_HID_BEGIN]->GetStatus());
pad_state.plus.Assign(button_state[Plus - BUTTON_HID_BEGIN]->GetStatus());
pad_state.minus.Assign(button_state[Minus - BUTTON_HID_BEGIN]->GetStatus());
pad_state.d_left.Assign(button_state[DLeft - BUTTON_HID_BEGIN]->GetStatus()); pad_state.r_stick_right.Assign(
pad_state.d_up.Assign(button_state[DUp - BUTTON_HID_BEGIN]->GetStatus()); analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)]
pad_state.d_right.Assign(button_state[DRight - BUTTON_HID_BEGIN]->GetStatus()); ->GetAnalogDirectionStatus(Input::AnalogDirection::RIGHT));
pad_state.d_down.Assign(button_state[DDown - BUTTON_HID_BEGIN]->GetStatus()); pad_state.r_stick_left.Assign(
analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)]
->GetAnalogDirectionStatus(Input::AnalogDirection::LEFT));
pad_state.r_stick_up.Assign(
analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)]
->GetAnalogDirectionStatus(Input::AnalogDirection::UP));
pad_state.r_stick_down.Assign(
analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)]
->GetAnalogDirectionStatus(Input::AnalogDirection::DOWN));
rstick_entry.x = static_cast<s32>(stick_r_x_f * HID_JOYSTICK_MAX);
rstick_entry.y = static_cast<s32>(stick_r_y_f * HID_JOYSTICK_MAX);
}
pad_state.l_stick_right.Assign( if (controller_type != NPadControllerType::JoyRight) {
analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetAnalogDirectionStatus( pad_state.d_left.Assign(button_state[DLeft - BUTTON_HID_BEGIN]->GetStatus());
Input::AnalogDirection::RIGHT)); pad_state.d_up.Assign(button_state[DUp - BUTTON_HID_BEGIN]->GetStatus());
pad_state.l_stick_left.Assign( pad_state.d_right.Assign(button_state[DRight - BUTTON_HID_BEGIN]->GetStatus());
analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetAnalogDirectionStatus( pad_state.d_down.Assign(button_state[DDown - BUTTON_HID_BEGIN]->GetStatus());
Input::AnalogDirection::LEFT)); pad_state.l_stick.Assign(button_state[LStick - BUTTON_HID_BEGIN]->GetStatus());
pad_state.l_stick_up.Assign( pad_state.l.Assign(button_state[L - BUTTON_HID_BEGIN]->GetStatus());
analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetAnalogDirectionStatus( pad_state.zl.Assign(button_state[ZL - BUTTON_HID_BEGIN]->GetStatus());
Input::AnalogDirection::UP)); pad_state.minus.Assign(button_state[Minus - BUTTON_HID_BEGIN]->GetStatus());
pad_state.l_stick_down.Assign(
analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetAnalogDirectionStatus(
Input::AnalogDirection::DOWN));
pad_state.r_stick_right.Assign( pad_state.l_stick_right.Assign(
analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)] analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]
->GetAnalogDirectionStatus(Input::AnalogDirection::RIGHT)); ->GetAnalogDirectionStatus(Input::AnalogDirection::RIGHT));
pad_state.r_stick_left.Assign(analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)] pad_state.l_stick_left.Assign(
->GetAnalogDirectionStatus(Input::AnalogDirection::LEFT)); analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]
pad_state.r_stick_up.Assign(analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)] ->GetAnalogDirectionStatus(Input::AnalogDirection::LEFT));
->GetAnalogDirectionStatus(Input::AnalogDirection::UP)); pad_state.l_stick_up.Assign(
pad_state.r_stick_down.Assign(analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)] analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]
->GetAnalogDirectionStatus(Input::AnalogDirection::DOWN)); ->GetAnalogDirectionStatus(Input::AnalogDirection::UP));
pad_state.l_stick_down.Assign(
analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]
->GetAnalogDirectionStatus(Input::AnalogDirection::DOWN));
lstick_entry.x = static_cast<s32>(stick_l_x_f * HID_JOYSTICK_MAX);
lstick_entry.y = static_cast<s32>(stick_l_y_f * HID_JOYSTICK_MAX);
}
pad_state.left_sl.Assign(button_state[SL - BUTTON_HID_BEGIN]->GetStatus()); if (controller_type == NPadControllerType::JoyLeft ||
pad_state.left_sr.Assign(button_state[SR - BUTTON_HID_BEGIN]->GetStatus()); controller_type == NPadControllerType::JoyRight) {
pad_state.left_sl.Assign(button_state[SL - BUTTON_HID_BEGIN]->GetStatus());
lstick_entry.x = static_cast<s32>(stick_l_x_f * HID_JOYSTICK_MAX); pad_state.left_sr.Assign(button_state[SR - BUTTON_HID_BEGIN]->GetStatus());
lstick_entry.y = static_cast<s32>(stick_l_y_f * HID_JOYSTICK_MAX); }
rstick_entry.x = static_cast<s32>(stick_r_x_f * HID_JOYSTICK_MAX);
rstick_entry.y = static_cast<s32>(stick_r_y_f * HID_JOYSTICK_MAX);
} }
void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* data, void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* data,