From c4760489a0386cdeaed68ecbed7f87532193743e Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Sun, 21 Nov 2021 12:59:51 -0600
Subject: input_common: Fix SDL controller with inverted axis
---
src/input_common/drivers/sdl_driver.cpp | 23 -----------------------
1 file changed, 23 deletions(-)
(limited to 'src/input_common/drivers/sdl_driver.cpp')
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp
index 0b24f1858c..d5af6c09b4 100644
--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -220,24 +220,6 @@ public:
return "Unknown";
}
- bool IsYAxis(u8 index) {
- if (!sdl_controller) {
- return false;
- }
-
- const auto& binding_left_y =
- SDL_GameControllerGetBindForAxis(sdl_controller.get(), SDL_CONTROLLER_AXIS_LEFTY);
- const auto& binding_right_y =
- SDL_GameControllerGetBindForAxis(sdl_controller.get(), SDL_CONTROLLER_AXIS_RIGHTY);
- if (index == binding_left_y.value.axis) {
- return true;
- }
- if (index == binding_right_y.value.axis) {
- return true;
- }
- return false;
- }
-
private:
std::string guid;
int port;
@@ -376,11 +358,6 @@ void SDLDriver::HandleGameControllerEvent(const SDL_Event& event) {
case SDL_JOYAXISMOTION: {
if (const auto joystick = GetSDLJoystickBySDLID(event.jaxis.which)) {
const PadIdentifier identifier = joystick->GetPadIdentifier();
- // Vertical axis is inverted on nintendo compared to SDL
- if (joystick->IsYAxis(event.jaxis.axis)) {
- SetAxis(identifier, event.jaxis.axis, -event.jaxis.value / 32767.0f);
- break;
- }
SetAxis(identifier, event.jaxis.axis, event.jaxis.value / 32767.0f);
}
break;
--
cgit v1.2.3-70-g09d2