diff options
author | german <german@thesoftwareartisans.com> | 2021-01-13 04:09:59 +0100 |
---|---|---|
committer | german <german@thesoftwareartisans.com> | 2021-02-06 16:43:41 +0100 |
commit | 481cd86722f7070b6a63f2b95c1e8bceb518eee7 (patch) | |
tree | 5ec35ba24ca028b381f80963d40c2ed375229b84 /src/input_common | |
parent | Merge pull request #5326 from german77/hidUpdate1 (diff) | |
download | yuzu-481cd86722f7070b6a63f2b95c1e8bceb518eee7.tar yuzu-481cd86722f7070b6a63f2b95c1e8bceb518eee7.tar.gz yuzu-481cd86722f7070b6a63f2b95c1e8bceb518eee7.tar.bz2 yuzu-481cd86722f7070b6a63f2b95c1e8bceb518eee7.tar.lz yuzu-481cd86722f7070b6a63f2b95c1e8bceb518eee7.tar.xz yuzu-481cd86722f7070b6a63f2b95c1e8bceb518eee7.tar.zst yuzu-481cd86722f7070b6a63f2b95c1e8bceb518eee7.zip |
Diffstat (limited to 'src/input_common')
-rw-r--r-- | src/input_common/gcadapter/gc_poller.cpp | 10 | ||||
-rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp index 9670bdeb2..1b6ded8d6 100644 --- a/src/input_common/gcadapter/gc_poller.cpp +++ b/src/input_common/gcadapter/gc_poller.cpp @@ -185,6 +185,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}; + } + bool GetAnalogDirectionStatus(Input::AnalogDirection direction) const override { const auto [x, y] = GetStatus(); const float directional_deadzone = 0.5f; diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index 1b5750937..f67de37e3 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp @@ -377,6 +377,16 @@ public: return {}; } + std::tuple<float, float> GetRawStatus() const override { + const float x = joystick->GetAxis(axis_x, range); + const float y = joystick->GetAxis(axis_y, range); + return {x, -y}; + } + + Input::AnalogProperties GetAnalogProperties() const override { + return {deadzone, range, 0.5f}; + } + bool GetAnalogDirectionStatus(Input::AnalogDirection direction) const override { const auto [x, y] = GetStatus(); const float directional_deadzone = 0.5f; |