|
|
|
@ -20,7 +20,7 @@ InputInterpreter::InputInterpreter(Core::System& system) |
|
|
|
InputInterpreter::~InputInterpreter() = default; |
|
|
|
|
|
|
|
void InputInterpreter::PollInput() { |
|
|
|
const u64 button_state = npad.GetAndResetPressState(); |
|
|
|
const auto button_state = npad.GetAndResetPressState(); |
|
|
|
|
|
|
|
previous_index = current_index; |
|
|
|
current_index = (current_index + 1) % button_states.size(); |
|
|
|
@ -32,30 +32,30 @@ void InputInterpreter::ResetButtonStates() { |
|
|
|
previous_index = 0; |
|
|
|
current_index = 0; |
|
|
|
|
|
|
|
button_states[0] = 0xFFFFFFFFFFFFFFFF; |
|
|
|
button_states[0] = Core::HID::NpadButton::All; |
|
|
|
|
|
|
|
for (std::size_t i = 1; i < button_states.size(); ++i) { |
|
|
|
button_states[i] = 0; |
|
|
|
button_states[i] = Core::HID::NpadButton::None; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
bool InputInterpreter::IsButtonPressed(Core::HID::NpadButton button) const { |
|
|
|
return (button_states[current_index] & static_cast<u64>(button)) != 0; |
|
|
|
return True(button_states[current_index] & button); |
|
|
|
} |
|
|
|
|
|
|
|
bool InputInterpreter::IsButtonPressedOnce(Core::HID::NpadButton button) const { |
|
|
|
const bool current_press = (button_states[current_index] & static_cast<u64>(button)) != 0; |
|
|
|
const bool previous_press = (button_states[previous_index] & static_cast<u64>(button)) != 0; |
|
|
|
const bool current_press = True(button_states[current_index] & button); |
|
|
|
const bool previous_press = True(button_states[previous_index] & button); |
|
|
|
|
|
|
|
return current_press && !previous_press; |
|
|
|
} |
|
|
|
|
|
|
|
bool InputInterpreter::IsButtonHeld(Core::HID::NpadButton button) const { |
|
|
|
u64 held_buttons{button_states[0]}; |
|
|
|
Core::HID::NpadButton held_buttons{button_states[0]}; |
|
|
|
|
|
|
|
for (std::size_t i = 1; i < button_states.size(); ++i) { |
|
|
|
held_buttons &= button_states[i]; |
|
|
|
} |
|
|
|
|
|
|
|
return (held_buttons & static_cast<u64>(button)) != 0; |
|
|
|
return True(held_buttons & button); |
|
|
|
} |