summaryrefslogtreecommitdiffstats
path: root/src/input_common
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2022-11-28 16:08:50 +0100
committerLioncash <mathew1800@gmail.com>2022-11-28 16:10:37 +0100
commit8265c167d34798d6a55a5af18fd2d1b704d45a3f (patch)
treefa65d033969cfa2cceac18ca285c3b2dc63120f8 /src/input_common
parentMerge pull request #9325 from german77/default_by_default (diff)
downloadyuzu-8265c167d34798d6a55a5af18fd2d1b704d45a3f.tar
yuzu-8265c167d34798d6a55a5af18fd2d1b704d45a3f.tar.gz
yuzu-8265c167d34798d6a55a5af18fd2d1b704d45a3f.tar.bz2
yuzu-8265c167d34798d6a55a5af18fd2d1b704d45a3f.tar.lz
yuzu-8265c167d34798d6a55a5af18fd2d1b704d45a3f.tar.xz
yuzu-8265c167d34798d6a55a5af18fd2d1b704d45a3f.tar.zst
yuzu-8265c167d34798d6a55a5af18fd2d1b704d45a3f.zip
Diffstat (limited to 'src/input_common')
-rw-r--r--src/input_common/helpers/stick_from_buttons.cpp10
-rw-r--r--src/input_common/helpers/touch_from_buttons.cpp10
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 536d413a5..cdd360f13 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 003a38da5..ff633a807 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(