diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2022-11-28 19:12:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-28 19:12:14 +0100 |
commit | 51abe35e0534b4a6393b8b6ed481912d9f088f72 (patch) | |
tree | 6a60bfcfa3fc33179ca78dfb86ef50523b0c01f1 /src/input_common | |
parent | Merge pull request #9337 from lioncash/pbr (diff) | |
parent | input_common/helpers: Mark analog property structs members as static constexpr (diff) | |
download | yuzu-51abe35e0534b4a6393b8b6ed481912d9f088f72.tar yuzu-51abe35e0534b4a6393b8b6ed481912d9f088f72.tar.gz yuzu-51abe35e0534b4a6393b8b6ed481912d9f088f72.tar.bz2 yuzu-51abe35e0534b4a6393b8b6ed481912d9f088f72.tar.lz yuzu-51abe35e0534b4a6393b8b6ed481912d9f088f72.tar.xz yuzu-51abe35e0534b4a6393b8b6ed481912d9f088f72.tar.zst yuzu-51abe35e0534b4a6393b8b6ed481912d9f088f72.zip |
Diffstat (limited to 'src/input_common')
-rw-r--r-- | src/input_common/helpers/stick_from_buttons.cpp | 10 | ||||
-rw-r--r-- | src/input_common/helpers/touch_from_buttons.cpp | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/input_common/helpers/stick_from_buttons.cpp b/src/input_common/helpers/stick_from_buttons.cpp index 09aec2b04..82aa6ac2f 100644 --- a/src/input_common/helpers/stick_from_buttons.cpp +++ b/src/input_common/helpers/stick_from_buttons.cpp @@ -294,6 +294,15 @@ public: } private: + static constexpr Common::Input::AnalogProperties properties{ + .deadzone = 0.0f, + .range = 1.0f, + .threshold = 0.5f, + .offset = 0.0f, + .inverted = false, + .toggle = false, + }; + Button up; Button down; Button left; @@ -311,7 +320,6 @@ private: float last_x_axis_value{}; float last_y_axis_value{}; Common::Input::ButtonStatus modifier_status{}; - const Common::Input::AnalogProperties properties{0.0f, 1.0f, 0.5f, 0.0f, false}; std::chrono::time_point<std::chrono::steady_clock> last_update; }; diff --git a/src/input_common/helpers/touch_from_buttons.cpp b/src/input_common/helpers/touch_from_buttons.cpp index f44663ac6..e064b13d9 100644 --- a/src/input_common/helpers/touch_from_buttons.cpp +++ b/src/input_common/helpers/touch_from_buttons.cpp @@ -59,11 +59,19 @@ public: } private: + static constexpr Common::Input::AnalogProperties properties{ + .deadzone = 0.0f, + .range = 1.0f, + .threshold = 0.5f, + .offset = 0.0f, + .inverted = false, + .toggle = false, + }; + Button button; bool last_button_value; const float x; const float y; - const Common::Input::AnalogProperties properties{0.0f, 1.0f, 0.5f, 0.0f, false}; }; std::unique_ptr<Common::Input::InputDevice> TouchFromButton::Create( |