diff options
| author | 2022-11-28 13:12:14 -0500 | |
|---|---|---|
| committer | 2022-11-28 13:12:14 -0500 | |
| commit | 51abe35e0534b4a6393b8b6ed481912d9f088f72 (patch) | |
| tree | 6a60bfcfa3fc33179ca78dfb86ef50523b0c01f1 /src/input_common/helpers/stick_from_buttons.cpp | |
| 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.gz yuzu-51abe35e0534b4a6393b8b6ed481912d9f088f72.tar.xz yuzu-51abe35e0534b4a6393b8b6ed481912d9f088f72.zip | |
Merge pull request #9338 from lioncash/properties
input_common/helpers: Mark analog property structs members as static constexpr
Diffstat (limited to 'src/input_common/helpers/stick_from_buttons.cpp')
| -rw-r--r-- | src/input_common/helpers/stick_from_buttons.cpp | 10 |
1 files changed, 9 insertions, 1 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: | |||
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | private: | 296 | private: |
| 297 | static constexpr Common::Input::AnalogProperties properties{ | ||
| 298 | .deadzone = 0.0f, | ||
| 299 | .range = 1.0f, | ||
| 300 | .threshold = 0.5f, | ||
| 301 | .offset = 0.0f, | ||
| 302 | .inverted = false, | ||
| 303 | .toggle = false, | ||
| 304 | }; | ||
| 305 | |||
| 297 | Button up; | 306 | Button up; |
| 298 | Button down; | 307 | Button down; |
| 299 | Button left; | 308 | Button left; |
| @@ -311,7 +320,6 @@ private: | |||
| 311 | float last_x_axis_value{}; | 320 | float last_x_axis_value{}; |
| 312 | float last_y_axis_value{}; | 321 | float last_y_axis_value{}; |
| 313 | Common::Input::ButtonStatus modifier_status{}; | 322 | Common::Input::ButtonStatus modifier_status{}; |
| 314 | const Common::Input::AnalogProperties properties{0.0f, 1.0f, 0.5f, 0.0f, false}; | ||
| 315 | std::chrono::time_point<std::chrono::steady_clock> last_update; | 323 | std::chrono::time_point<std::chrono::steady_clock> last_update; |
| 316 | }; | 324 | }; |
| 317 | 325 | ||