diff options
author | german <german@thesoftwareartisans.com> | 2021-02-02 21:39:47 -0600 |
---|---|---|
committer | german <german@thesoftwareartisans.com> | 2021-02-06 09:43:42 -0600 |
commit | c9597af39ded9430cc94c37959fb8154abea8686 (patch) | |
tree | c3ba0877b806e5916d2ffd36736e66d382891815 /src/input_common | |
parent | a7f9983563f76d1bca071be7490c2abf57ce16d5 (diff) |
Add SL SR vectors, change dual joycon view, add missing raw data from keyboard/mouse
Diffstat (limited to 'src/input_common')
-rwxr-xr-x | src/input_common/analog_from_button.cpp | 4 | ||||
-rw-r--r-- | src/input_common/mouse/mouse_poller.cpp | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/input_common/analog_from_button.cpp b/src/input_common/analog_from_button.cpp index 07a0fa4a1..770893687 100755 --- a/src/input_common/analog_from_button.cpp +++ b/src/input_common/analog_from_button.cpp @@ -139,6 +139,10 @@ public: static_cast<float>(y) * coef * (x == 0 ? 1.0f : SQRT_HALF)); } + Input::AnalogProperties GetAnalogProperties() const override { + return {modifier_scale, 1.0f, 0.5f}; + } + bool GetAnalogDirectionStatus(Input::AnalogDirection direction) const override { switch (direction) { case Input::AnalogDirection::RIGHT: diff --git a/src/input_common/mouse/mouse_poller.cpp b/src/input_common/mouse/mouse_poller.cpp index 508eb0c7d..3d799b293 100644 --- a/src/input_common/mouse/mouse_poller.cpp +++ b/src/input_common/mouse/mouse_poller.cpp @@ -106,6 +106,16 @@ public: return {0.0f, 0.0f}; } + std::tuple<float, float> GetRawStatus() const override { + const float x = GetAxis(axis_x); + const float y = GetAxis(axis_y); + return {x, y}; + } + + Input::AnalogProperties GetAnalogProperties() const override { + return {deadzone, range, 0.5f}; + } + private: const u32 button; const u32 axis_x; |