diff options
| author | 2021-10-27 18:06:13 -0500 | |
|---|---|---|
| committer | 2021-11-24 20:30:26 -0600 | |
| commit | 2d3a63b28969089746e43ed232dc74630fbfc3b2 (patch) | |
| tree | f75d3245b6e23815611796c85b96fa4c7674c3e2 /src/core/hid/input_interpreter.cpp | |
| parent | core/hid: Add TAS input (diff) | |
| download | yuzu-2d3a63b28969089746e43ed232dc74630fbfc3b2.tar.gz yuzu-2d3a63b28969089746e43ed232dc74630fbfc3b2.tar.xz yuzu-2d3a63b28969089746e43ed232dc74630fbfc3b2.zip | |
core/hid: Update structs to 13.1.0
Diffstat (limited to 'src/core/hid/input_interpreter.cpp')
| -rw-r--r-- | src/core/hid/input_interpreter.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hid/input_interpreter.cpp b/src/core/hid/input_interpreter.cpp index 7e7c1816f..870422d82 100644 --- a/src/core/hid/input_interpreter.cpp +++ b/src/core/hid/input_interpreter.cpp | |||
| @@ -20,7 +20,7 @@ InputInterpreter::InputInterpreter(Core::System& system) | |||
| 20 | InputInterpreter::~InputInterpreter() = default; | 20 | InputInterpreter::~InputInterpreter() = default; |
| 21 | 21 | ||
| 22 | void InputInterpreter::PollInput() { | 22 | void InputInterpreter::PollInput() { |
| 23 | const u32 button_state = npad.GetAndResetPressState(); | 23 | const u64 button_state = npad.GetAndResetPressState(); |
| 24 | 24 | ||
| 25 | previous_index = current_index; | 25 | previous_index = current_index; |
| 26 | current_index = (current_index + 1) % button_states.size(); | 26 | current_index = (current_index + 1) % button_states.size(); |
| @@ -32,7 +32,7 @@ void InputInterpreter::ResetButtonStates() { | |||
| 32 | previous_index = 0; | 32 | previous_index = 0; |
| 33 | current_index = 0; | 33 | current_index = 0; |
| 34 | 34 | ||
| 35 | button_states[0] = 0xFFFFFFFF; | 35 | button_states[0] = 0xFFFFFFFFFFFFFFFF; |
| 36 | 36 | ||
| 37 | for (std::size_t i = 1; i < button_states.size(); ++i) { | 37 | for (std::size_t i = 1; i < button_states.size(); ++i) { |
| 38 | button_states[i] = 0; | 38 | button_states[i] = 0; |
| @@ -40,22 +40,22 @@ void InputInterpreter::ResetButtonStates() { | |||
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | bool InputInterpreter::IsButtonPressed(Core::HID::NpadButton button) const { | 42 | bool InputInterpreter::IsButtonPressed(Core::HID::NpadButton button) const { |
| 43 | return (button_states[current_index] & static_cast<u32>(button)) != 0; | 43 | return (button_states[current_index] & static_cast<u64>(button)) != 0; |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | bool InputInterpreter::IsButtonPressedOnce(Core::HID::NpadButton button) const { | 46 | bool InputInterpreter::IsButtonPressedOnce(Core::HID::NpadButton button) const { |
| 47 | const bool current_press = (button_states[current_index] & static_cast<u32>(button)) != 0; | 47 | const bool current_press = (button_states[current_index] & static_cast<u64>(button)) != 0; |
| 48 | const bool previous_press = (button_states[previous_index] & static_cast<u32>(button)) != 0; | 48 | const bool previous_press = (button_states[previous_index] & static_cast<u64>(button)) != 0; |
| 49 | 49 | ||
| 50 | return current_press && !previous_press; | 50 | return current_press && !previous_press; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | bool InputInterpreter::IsButtonHeld(Core::HID::NpadButton button) const { | 53 | bool InputInterpreter::IsButtonHeld(Core::HID::NpadButton button) const { |
| 54 | u32 held_buttons{button_states[0]}; | 54 | u64 held_buttons{button_states[0]}; |
| 55 | 55 | ||
| 56 | for (std::size_t i = 1; i < button_states.size(); ++i) { | 56 | for (std::size_t i = 1; i < button_states.size(); ++i) { |
| 57 | held_buttons &= button_states[i]; | 57 | held_buttons &= button_states[i]; |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | return (held_buttons & static_cast<u32>(button)) != 0; | 60 | return (held_buttons & static_cast<u64>(button)) != 0; |
| 61 | } | 61 | } |