diff --git a/pcsx2/SIO/Pad/PadBase.h b/pcsx2/SIO/Pad/PadBase.h index 64d727ba56..eee8993169 100644 --- a/pcsx2/SIO/Pad/PadBase.h +++ b/pcsx2/SIO/Pad/PadBase.h @@ -47,6 +47,7 @@ public: // Public members virtual void SetButtonDeadzone(float deadzone) = 0; virtual void SetAnalogInvertL(bool x, bool y) = 0; virtual void SetAnalogInvertR(bool x, bool y) = 0; + virtual u8 GetEffectiveInput(u32 index) const = 0; virtual u8 GetRawInput(u32 index) const = 0; virtual std::tuple GetRawLeftAnalog() const = 0; virtual std::tuple GetRawRightAnalog() const = 0; diff --git a/pcsx2/SIO/Pad/PadDualshock2.cpp b/pcsx2/SIO/Pad/PadDualshock2.cpp index f5dea1effd..5ed1d20297 100644 --- a/pcsx2/SIO/Pad/PadDualshock2.cpp +++ b/pcsx2/SIO/Pad/PadDualshock2.cpp @@ -785,6 +785,42 @@ void PadDualshock2::SetAnalogInvertR(bool x, bool y) this->analogs.ryInvert = y; } +u8 PadDualshock2::GetEffectiveInput(u32 index) const +{ + if (!IsAnalogKey(index)) + return GetRawInput(index); + + switch (index) + { + case Inputs::PAD_L_LEFT: + return (analogs.lx > 0 && analogs.lx < 127) ? analogs.lx : 0; + + case Inputs::PAD_L_RIGHT: + return (analogs.lx >= 128) ? analogs.lx : 0; + + case Inputs::PAD_L_UP: + return (analogs.ly > 0 && analogs.ly < 127) ? analogs.ly : 0; + + case Inputs::PAD_L_DOWN: + return (analogs.ly >= 128) ? analogs.ly : 0; + + case Inputs::PAD_R_LEFT: + return (analogs.rx > 0 && analogs.rx < 127) ? analogs.rx : 0; + + case Inputs::PAD_R_RIGHT: + return (analogs.rx >= 128) ? analogs.rx : 0; + + case Inputs::PAD_R_UP: + return (analogs.ry > 0 && analogs.ry < 127) ? analogs.ry : 0; + + case Inputs::PAD_R_DOWN: + return (analogs.ry >= 128) ? analogs.ry : 0; + + default: + return 0; + } +} + u8 PadDualshock2::GetRawInput(u32 index) const { return rawInputs[index]; diff --git a/pcsx2/SIO/Pad/PadDualshock2.h b/pcsx2/SIO/Pad/PadDualshock2.h index 57caaacf41..d58afa986e 100644 --- a/pcsx2/SIO/Pad/PadDualshock2.h +++ b/pcsx2/SIO/Pad/PadDualshock2.h @@ -125,6 +125,7 @@ public: void SetButtonDeadzone(float deadzone) override; void SetAnalogInvertL(bool x, bool y) override; void SetAnalogInvertR(bool x, bool y) override; + u8 GetEffectiveInput(u32 index) const override; u8 GetRawInput(u32 index) const override; std::tuple GetRawLeftAnalog() const override; std::tuple GetRawRightAnalog() const override; diff --git a/pcsx2/SIO/Pad/PadGuitar.cpp b/pcsx2/SIO/Pad/PadGuitar.cpp index 81a7a1f736..7a52c2ec72 100644 --- a/pcsx2/SIO/Pad/PadGuitar.cpp +++ b/pcsx2/SIO/Pad/PadGuitar.cpp @@ -355,6 +355,11 @@ void PadGuitar::SetAnalogInvertR(bool x, bool y) { } +u8 PadGuitar::GetEffectiveInput(u32 index) const +{ + return GetRawInput(index); +} + u8 PadGuitar::GetRawInput(u32 index) const { return rawInputs[index]; diff --git a/pcsx2/SIO/Pad/PadGuitar.h b/pcsx2/SIO/Pad/PadGuitar.h index 3625a1c6de..a3692d62da 100644 --- a/pcsx2/SIO/Pad/PadGuitar.h +++ b/pcsx2/SIO/Pad/PadGuitar.h @@ -66,6 +66,7 @@ public: void SetButtonDeadzone(float deadzone) override; void SetAnalogInvertL(bool x, bool y) override; void SetAnalogInvertR(bool x, bool y) override; + u8 GetEffectiveInput(u32 index) const override; u8 GetRawInput(u32 index) const override; std::tuple GetRawLeftAnalog() const override; std::tuple GetRawRightAnalog() const override; diff --git a/pcsx2/SIO/Pad/PadNotConnected.cpp b/pcsx2/SIO/Pad/PadNotConnected.cpp index 81c92d760f..5b62c29ca1 100644 --- a/pcsx2/SIO/Pad/PadNotConnected.cpp +++ b/pcsx2/SIO/Pad/PadNotConnected.cpp @@ -76,6 +76,11 @@ void PadNotConnected::SetAnalogInvertR(bool x, bool y) } +u8 PadNotConnected::GetEffectiveInput(u32 index) const +{ + return 0; +} + u8 PadNotConnected::GetRawInput(u32 index) const { return 0; diff --git a/pcsx2/SIO/Pad/PadNotConnected.h b/pcsx2/SIO/Pad/PadNotConnected.h index 36c895689c..990ecf3c8d 100644 --- a/pcsx2/SIO/Pad/PadNotConnected.h +++ b/pcsx2/SIO/Pad/PadNotConnected.h @@ -23,6 +23,7 @@ public: void SetButtonDeadzone(float deadzone) override; void SetAnalogInvertL(bool x, bool y) override; void SetAnalogInvertR(bool x, bool y) override; + u8 GetEffectiveInput(u32 index) const override; u8 GetRawInput(u32 index) const override; std::tuple GetRawLeftAnalog() const override; std::tuple GetRawRightAnalog() const override; diff --git a/pcsx2/SIO/Pad/PadPopn.cpp b/pcsx2/SIO/Pad/PadPopn.cpp index 2471fe296e..5ba10fba27 100644 --- a/pcsx2/SIO/Pad/PadPopn.cpp +++ b/pcsx2/SIO/Pad/PadPopn.cpp @@ -441,6 +441,11 @@ void PadPopn::SetAnalogInvertR(bool x, bool y) { } +u8 PadPopn::GetEffectiveInput(u32 index) const +{ + return GetRawInput(index); +} + u8 PadPopn::GetRawInput(u32 index) const { return rawInputs[index]; diff --git a/pcsx2/SIO/Pad/PadPopn.h b/pcsx2/SIO/Pad/PadPopn.h index e42ee6c5b1..9c83199f55 100644 --- a/pcsx2/SIO/Pad/PadPopn.h +++ b/pcsx2/SIO/Pad/PadPopn.h @@ -89,6 +89,7 @@ public: void SetButtonDeadzone(float deadzone) override; void SetAnalogInvertL(bool x, bool y) override; void SetAnalogInvertR(bool x, bool y) override; + u8 GetEffectiveInput(u32 index) const override; u8 GetRawInput(u32 index) const override; std::tuple GetRawLeftAnalog() const override; std::tuple GetRawRightAnalog() const override;