diff options
author | german77 <juangerman-13@hotmail.com> | 2021-09-21 03:53:04 +0200 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2021-11-25 03:30:24 +0100 |
commit | e14ae06391ac724e4be4557df0568846687a3662 (patch) | |
tree | 3db695f4e13214aa638c182e66f94f156b8f5115 /src/core/hid/input_interpreter.h | |
parent | yuzu: Update overlay applet (diff) | |
download | yuzu-e14ae06391ac724e4be4557df0568846687a3662.tar yuzu-e14ae06391ac724e4be4557df0568846687a3662.tar.gz yuzu-e14ae06391ac724e4be4557df0568846687a3662.tar.bz2 yuzu-e14ae06391ac724e4be4557df0568846687a3662.tar.lz yuzu-e14ae06391ac724e4be4557df0568846687a3662.tar.xz yuzu-e14ae06391ac724e4be4557df0568846687a3662.tar.zst yuzu-e14ae06391ac724e4be4557df0568846687a3662.zip |
Diffstat (limited to 'src/core/hid/input_interpreter.h')
-rw-r--r-- | src/core/hid/input_interpreter.h | 52 |
1 files changed, 10 insertions, 42 deletions
diff --git a/src/core/hid/input_interpreter.h b/src/core/hid/input_interpreter.h index 9495e3daf..1791cf9b7 100644 --- a/src/core/hid/input_interpreter.h +++ b/src/core/hid/input_interpreter.h @@ -12,46 +12,14 @@ namespace Core { class System; } +namespace Core::HID { +enum class NpadButton : u64; +} + namespace Service::HID { class Controller_NPad; } -enum class HIDButton : u8 { - A, - B, - X, - Y, - LStick, - RStick, - L, - R, - ZL, - ZR, - Plus, - Minus, - - DLeft, - DUp, - DRight, - DDown, - - LStickLeft, - LStickUp, - LStickRight, - LStickDown, - - RStickLeft, - RStickUp, - RStickRight, - RStickDown, - - LeftSL, - LeftSR, - - RightSL, - RightSR, -}; - /** * The InputInterpreter class interfaces with HID to retrieve button press states. * Input is intended to be polled every 50ms so that a button is considered to be @@ -76,7 +44,7 @@ public: * * @returns True when the button is pressed. */ - [[nodiscard]] bool IsButtonPressed(HIDButton button) const; + [[nodiscard]] bool IsButtonPressed(Core::HID::NpadButton button) const; /** * Checks whether any of the buttons in the parameter list is pressed. @@ -85,7 +53,7 @@ public: * * @returns True when at least one of the buttons is pressed. */ - template <HIDButton... T> + template <Core::HID::NpadButton... T> [[nodiscard]] bool IsAnyButtonPressed() { return (IsButtonPressed(T) || ...); } @@ -98,7 +66,7 @@ public: * * @returns True when the button is pressed once. */ - [[nodiscard]] bool IsButtonPressedOnce(HIDButton button) const; + [[nodiscard]] bool IsButtonPressedOnce(Core::HID::NpadButton button) const; /** * Checks whether any of the buttons in the parameter list is pressed once. @@ -107,7 +75,7 @@ public: * * @returns True when at least one of the buttons is pressed once. */ - template <HIDButton... T> + template <Core::HID::NpadButton... T> [[nodiscard]] bool IsAnyButtonPressedOnce() const { return (IsButtonPressedOnce(T) || ...); } @@ -119,7 +87,7 @@ public: * * @returns True when the button is held down. */ - [[nodiscard]] bool IsButtonHeld(HIDButton button) const; + [[nodiscard]] bool IsButtonHeld(Core::HID::NpadButton button) const; /** * Checks whether any of the buttons in the parameter list is held down. @@ -128,7 +96,7 @@ public: * * @returns True when at least one of the buttons is held down. */ - template <HIDButton... T> + template <Core::HID::NpadButton... T> [[nodiscard]] bool IsAnyButtonHeld() const { return (IsButtonHeld(T) || ...); } |