diff options
author | David <25727384+ogniK5377@users.noreply.github.com> | 2020-09-30 13:24:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-30 13:24:11 +0200 |
commit | 4d0ae1a17a031488eadfa9133dac157fb71900c0 (patch) | |
tree | 166c4c4e09b828b4c987c6aacf00f5a041a79588 /src/core/hle/service/hid/controllers/npad.cpp | |
parent | Merge pull request #4726 from lioncash/applet (diff) | |
parent | First implementation of controller rumble (diff) | |
download | yuzu-4d0ae1a17a031488eadfa9133dac157fb71900c0.tar yuzu-4d0ae1a17a031488eadfa9133dac157fb71900c0.tar.gz yuzu-4d0ae1a17a031488eadfa9133dac157fb71900c0.tar.bz2 yuzu-4d0ae1a17a031488eadfa9133dac157fb71900c0.tar.lz yuzu-4d0ae1a17a031488eadfa9133dac157fb71900c0.tar.xz yuzu-4d0ae1a17a031488eadfa9133dac157fb71900c0.tar.zst yuzu-4d0ae1a17a031488eadfa9133dac157fb71900c0.zip |
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.cpp')
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index e34ee519e..fb007767d 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -665,20 +665,31 @@ void Controller_NPad::SetNpadMode(u32 npad_id, NPadAssignments assignment_mode) } } -void Controller_NPad::VibrateController(const std::vector<u32>& controller_ids, +void Controller_NPad::VibrateController(const std::vector<u32>& controllers, const std::vector<Vibration>& vibrations) { - LOG_DEBUG(Service_HID, "(STUBBED) called"); + LOG_TRACE(Service_HID, "called"); if (!Settings::values.vibration_enabled || !can_controllers_vibrate) { return; } - for (std::size_t i = 0; i < controller_ids.size(); i++) { - std::size_t controller_pos = NPadIdToIndex(static_cast<u32>(i)); - if (connected_controllers[controller_pos].is_connected) { - // TODO(ogniK): Vibrate the physical controller + bool success = true; + for (std::size_t i = 0; i < controllers.size(); ++i) { + if (!connected_controllers[i].is_connected) { + continue; + } + using namespace Settings::NativeButton; + const auto& button_state = buttons[i]; + if (button_state[A - BUTTON_HID_BEGIN]) { + if (button_state[A - BUTTON_HID_BEGIN]->SetRumblePlay( + vibrations[0].amp_high, vibrations[0].amp_low, vibrations[0].freq_high, + vibrations[0].freq_low)) { + success = false; + } } } - last_processed_vibration = vibrations.back(); + if (success) { + last_processed_vibration = vibrations.back(); + } } Controller_NPad::Vibration Controller_NPad::GetLastVibration() const { |