diff options
| author | 2020-08-27 14:58:44 -0400 | |
|---|---|---|
| committer | 2020-08-27 14:58:44 -0400 | |
| commit | 3db9a259771a44278ff34168ba140c2c7815a1cf (patch) | |
| tree | e341942ba33f882468837d763004ae7de5fe0053 /src/input_common/gcadapter/gc_poller.cpp | |
| parent | Merge pull request #4577 from lioncash/asserts (diff) | |
| parent | input_common/main: Add "/Mouse" to the display name (diff) | |
| download | yuzu-3db9a259771a44278ff34168ba140c2c7815a1cf.tar.gz yuzu-3db9a259771a44278ff34168ba140c2c7815a1cf.tar.xz yuzu-3db9a259771a44278ff34168ba140c2c7815a1cf.zip | |
Merge pull request #4530 from Morph1984/mjolnir-p1
Project Mjölnir: Part 1 - Input Rewrite
Diffstat (limited to 'src/input_common/gcadapter/gc_poller.cpp')
| -rw-r--r-- | src/input_common/gcadapter/gc_poller.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp index b346fdf8e..71cd85eeb 100644 --- a/src/input_common/gcadapter/gc_poller.cpp +++ b/src/input_common/gcadapter/gc_poller.cpp | |||
| @@ -191,7 +191,7 @@ public: | |||
| 191 | 191 | ||
| 192 | bool GetAnalogDirectionStatus(Input::AnalogDirection direction) const override { | 192 | bool GetAnalogDirectionStatus(Input::AnalogDirection direction) const override { |
| 193 | const auto [x, y] = GetStatus(); | 193 | const auto [x, y] = GetStatus(); |
| 194 | const float directional_deadzone = 0.4f; | 194 | const float directional_deadzone = 0.5f; |
| 195 | switch (direction) { | 195 | switch (direction) { |
| 196 | case Input::AnalogDirection::RIGHT: | 196 | case Input::AnalogDirection::RIGHT: |
| 197 | return x > directional_deadzone; | 197 | return x > directional_deadzone; |
| @@ -232,7 +232,7 @@ std::unique_ptr<Input::AnalogDevice> GCAnalogFactory::Create(const Common::Param | |||
| 232 | const int port = params.Get("port", 0); | 232 | const int port = params.Get("port", 0); |
| 233 | const int axis_x = params.Get("axis_x", 0); | 233 | const int axis_x = params.Get("axis_x", 0); |
| 234 | const int axis_y = params.Get("axis_y", 1); | 234 | const int axis_y = params.Get("axis_y", 1); |
| 235 | const float deadzone = std::clamp(params.Get("deadzone", 0.0f), 0.0f, .99f); | 235 | const float deadzone = std::clamp(params.Get("deadzone", 0.0f), 0.0f, 1.0f); |
| 236 | const float range = std::clamp(params.Get("range", 1.0f), 0.50f, 1.50f); | 236 | const float range = std::clamp(params.Get("range", 1.0f), 0.50f, 1.50f); |
| 237 | 237 | ||
| 238 | return std::make_unique<GCAnalog>(port, axis_x, axis_y, deadzone, adapter.get(), range); | 238 | return std::make_unique<GCAnalog>(port, axis_x, axis_y, deadzone, adapter.get(), range); |