diff options
| author | CJBok <cjbok@ziggo.nl> | 2020-01-09 02:40:55 +0100 |
|---|---|---|
| committer | CJBok <cjbok@ziggo.nl> | 2020-01-09 02:40:55 +0100 |
| commit | ae7fd01e38a1f187f83fa151cc30f1a9201ddfe7 (patch) | |
| tree | b0265f2041718dddc50a8ab4adfcf4df5da77c6b /src/core | |
| parent | Merge pull request #3272 from bunnei/vi-close-layer (diff) | |
| download | yuzu-ae7fd01e38a1f187f83fa151cc30f1a9201ddfe7.tar yuzu-ae7fd01e38a1f187f83fa151cc30f1a9201ddfe7.tar.gz yuzu-ae7fd01e38a1f187f83fa151cc30f1a9201ddfe7.tar.bz2 yuzu-ae7fd01e38a1f187f83fa151cc30f1a9201ddfe7.tar.lz yuzu-ae7fd01e38a1f187f83fa151cc30f1a9201ddfe7.tar.xz yuzu-ae7fd01e38a1f187f83fa151cc30f1a9201ddfe7.tar.zst yuzu-ae7fd01e38a1f187f83fa151cc30f1a9201ddfe7.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 4d952adc0..c3ce74e2b 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -250,6 +250,10 @@ void Controller_NPad::RequestPadStateUpdate(u32 npad_id) { auto& rstick_entry = npad_pad_states[controller_idx].r_stick; const auto& button_state = buttons[controller_idx]; const auto& analog_state = sticks[controller_idx]; + const auto [stick_l_x_f, stick_l_y_f] = + analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetStatus(); + const auto [stick_r_x_f, stick_r_y_f] = + analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)]->GetStatus(); using namespace Settings::NativeButton; pad_state.a.Assign(button_state[A - BUTTON_HID_BEGIN]->GetStatus()); @@ -270,23 +274,19 @@ void Controller_NPad::RequestPadStateUpdate(u32 npad_id) { pad_state.d_right.Assign(button_state[DRight - BUTTON_HID_BEGIN]->GetStatus()); pad_state.d_down.Assign(button_state[DDown - BUTTON_HID_BEGIN]->GetStatus()); - pad_state.l_stick_left.Assign(button_state[LStick_Left - BUTTON_HID_BEGIN]->GetStatus()); - pad_state.l_stick_up.Assign(button_state[LStick_Up - BUTTON_HID_BEGIN]->GetStatus()); - pad_state.l_stick_right.Assign(button_state[LStick_Right - BUTTON_HID_BEGIN]->GetStatus()); - pad_state.l_stick_down.Assign(button_state[LStick_Down - BUTTON_HID_BEGIN]->GetStatus()); + pad_state.l_stick_left.Assign(stick_l_x_f < 0.0); + pad_state.l_stick_up.Assign(stick_l_y_f > 0.0); + pad_state.l_stick_right.Assign(stick_l_x_f > 0.0); + pad_state.l_stick_down.Assign(stick_l_y_f < 0.0); - pad_state.r_stick_left.Assign(button_state[RStick_Left - BUTTON_HID_BEGIN]->GetStatus()); - pad_state.r_stick_up.Assign(button_state[RStick_Up - BUTTON_HID_BEGIN]->GetStatus()); - pad_state.r_stick_right.Assign(button_state[RStick_Right - BUTTON_HID_BEGIN]->GetStatus()); - pad_state.r_stick_down.Assign(button_state[RStick_Down - BUTTON_HID_BEGIN]->GetStatus()); + pad_state.r_stick_left.Assign(stick_r_x_f < 0.0); + pad_state.r_stick_up.Assign(stick_r_y_f > 0.0); + pad_state.r_stick_right.Assign(stick_r_x_f > 0.0); + pad_state.r_stick_down.Assign(stick_r_y_f < 0.0); pad_state.left_sl.Assign(button_state[SL - BUTTON_HID_BEGIN]->GetStatus()); pad_state.left_sr.Assign(button_state[SR - BUTTON_HID_BEGIN]->GetStatus()); - const auto [stick_l_x_f, stick_l_y_f] = - analog_state[static_cast<std::size_t>(JoystickId::Joystick_Left)]->GetStatus(); - const auto [stick_r_x_f, stick_r_y_f] = - analog_state[static_cast<std::size_t>(JoystickId::Joystick_Right)]->GetStatus(); 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); rstick_entry.x = static_cast<s32>(stick_r_x_f * HID_JOYSTICK_MAX); |