summaryrefslogtreecommitdiffstats
path: root/src/input_common/gcadapter/gc_poller.cpp
diff options
context:
space:
mode:
authorAmeer <aj662@drexel.edu>2020-07-03 17:52:07 +0200
committerAmeer <aj662@drexel.edu>2020-07-03 17:52:07 +0200
commite69d715e3d42aaa5e99ebe8e578e64242d049a8c (patch)
treefcbf379656f2f359a6e0b69fcc937ef098ab418d /src/input_common/gcadapter/gc_poller.cpp
parentFix unnecessary diffs (diff)
downloadyuzu-e69d715e3d42aaa5e99ebe8e578e64242d049a8c.tar
yuzu-e69d715e3d42aaa5e99ebe8e578e64242d049a8c.tar.gz
yuzu-e69d715e3d42aaa5e99ebe8e578e64242d049a8c.tar.bz2
yuzu-e69d715e3d42aaa5e99ebe8e578e64242d049a8c.tar.lz
yuzu-e69d715e3d42aaa5e99ebe8e578e64242d049a8c.tar.xz
yuzu-e69d715e3d42aaa5e99ebe8e578e64242d049a8c.tar.zst
yuzu-e69d715e3d42aaa5e99ebe8e578e64242d049a8c.zip
Diffstat (limited to '')
-rw-r--r--src/input_common/gcadapter/gc_poller.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/input_common/gcadapter/gc_poller.cpp b/src/input_common/gcadapter/gc_poller.cpp
index a04c507b8..385ce8430 100644
--- a/src/input_common/gcadapter/gc_poller.cpp
+++ b/src/input_common/gcadapter/gc_poller.cpp
@@ -14,7 +14,7 @@ namespace InputCommon {
class GCButton final : public Input::ButtonDevice {
public:
- explicit GCButton(int port_, int button_, int axis_, GCAdapter::Adapter* adapter)
+ explicit GCButton(int port_, int button_, GCAdapter::Adapter* adapter)
: port(port_), button(button_), gcadapter(adapter) {}
~GCButton() override;
@@ -45,7 +45,9 @@ public:
bool GetStatus() const override {
const float axis_value = (gcadapter->GetPadState()[port].axes.at(axis) - 128.0f) / 128.0f;
if (trigger_if_greater) {
- return axis_value > threshold; // TODO(ameerj) : Fix threshold.
+ // TODO: Might be worthwile to set a slider for the trigger threshold. It is currently
+ // always set to 0.5 in configure_input_player.cpp ZL/ZR HandleClick
+ return axis_value > threshold;
}
return axis_value < -threshold;
}
@@ -71,8 +73,7 @@ std::unique_ptr<Input::ButtonDevice> GCButtonFactory::Create(const Common::Param
// button is not an axis/stick button
if (button_id != PAD_STICK_ID) {
- std::unique_ptr<GCButton> button =
- std::make_unique<GCButton>(port, button_id, params.Get("axis", 0), adapter.get());
+ auto button = std::make_unique<GCButton>(port, button_id, adapter.get());
return std::move(button);
}