Browse Source
Merge pull request #9338 from lioncash/properties
input_common/helpers: Mark analog property structs members as static constexpr
pull/15/merge
Morph
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
18 additions and
2 deletions
-
src/input_common/helpers/stick_from_buttons.cpp
-
src/input_common/helpers/touch_from_buttons.cpp
|
|
@ -294,6 +294,15 @@ public: |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private: |
|
|
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 up; |
|
|
Button down; |
|
|
Button down; |
|
|
Button left; |
|
|
Button left; |
|
|
@ -311,7 +320,6 @@ private: |
|
|
float last_x_axis_value{}; |
|
|
float last_x_axis_value{}; |
|
|
float last_y_axis_value{}; |
|
|
float last_y_axis_value{}; |
|
|
Common::Input::ButtonStatus modifier_status{}; |
|
|
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; |
|
|
std::chrono::time_point<std::chrono::steady_clock> last_update; |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
@ -59,11 +59,19 @@ public: |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private: |
|
|
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; |
|
|
Button button; |
|
|
bool last_button_value; |
|
|
bool last_button_value; |
|
|
const float x; |
|
|
const float x; |
|
|
const float y; |
|
|
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( |
|
|
std::unique_ptr<Common::Input::InputDevice> TouchFromButton::Create( |
|
|
|