Merge pull request #7978 from german77/sideway
input_common: Map sticks correctly when mapped sideways
This commit is contained in:
commit
764e5c7fe5
|
@ -524,4 +524,20 @@ Common::Input::ButtonNames GCAdapter::GetUIName(const Common::ParamPackage& para
|
||||||
return Common::Input::ButtonNames::Invalid;
|
return Common::Input::ButtonNames::Invalid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool GCAdapter::IsStickInverted(const Common::ParamPackage& params) {
|
||||||
|
if (!params.Has("port")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto x_axis = static_cast<PadAxes>(params.Get("axis_x", 0));
|
||||||
|
const auto y_axis = static_cast<PadAxes>(params.Get("axis_y", 0));
|
||||||
|
if (x_axis != PadAxes::StickY && x_axis != PadAxes::SubstickY) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (y_axis != PadAxes::StickX && y_axis != PadAxes::SubstickX) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace InputCommon
|
} // namespace InputCommon
|
||||||
|
|
|
@ -35,6 +35,8 @@ public:
|
||||||
AnalogMapping GetAnalogMappingForDevice(const Common::ParamPackage& params) override;
|
AnalogMapping GetAnalogMappingForDevice(const Common::ParamPackage& params) override;
|
||||||
Common::Input::ButtonNames GetUIName(const Common::ParamPackage& params) const override;
|
Common::Input::ButtonNames GetUIName(const Common::ParamPackage& params) const override;
|
||||||
|
|
||||||
|
bool IsStickInverted(const Common::ParamPackage& params) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum class PadButton {
|
enum class PadButton {
|
||||||
Undefined = 0x0000,
|
Undefined = 0x0000,
|
||||||
|
|
|
@ -934,4 +934,37 @@ u8 SDLDriver::GetHatButtonId(const std::string& direction_name) const {
|
||||||
return direction;
|
return direction;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool SDLDriver::IsStickInverted(const Common::ParamPackage& params) {
|
||||||
|
if (!params.Has("guid") || !params.Has("port")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const auto joystick = GetSDLJoystickByGUID(params.Get("guid", ""), params.Get("port", 0));
|
||||||
|
if (joystick == nullptr) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
auto* controller = joystick->GetSDLGameController();
|
||||||
|
if (controller == nullptr) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto& axis_x = params.Get("axis_x", 0);
|
||||||
|
const auto& axis_y = params.Get("axis_y", 0);
|
||||||
|
const auto& binding_left_x =
|
||||||
|
SDL_GameControllerGetBindForAxis(controller, SDL_CONTROLLER_AXIS_LEFTX);
|
||||||
|
const auto& binding_right_x =
|
||||||
|
SDL_GameControllerGetBindForAxis(controller, SDL_CONTROLLER_AXIS_RIGHTX);
|
||||||
|
const auto& binding_left_y =
|
||||||
|
SDL_GameControllerGetBindForAxis(controller, SDL_CONTROLLER_AXIS_LEFTY);
|
||||||
|
const auto& binding_right_y =
|
||||||
|
SDL_GameControllerGetBindForAxis(controller, SDL_CONTROLLER_AXIS_RIGHTY);
|
||||||
|
|
||||||
|
if (axis_x != binding_left_y.value.axis && axis_x != binding_right_y.value.axis) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (axis_y != binding_left_x.value.axis && axis_y != binding_right_x.value.axis) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace InputCommon
|
} // namespace InputCommon
|
||||||
|
|
|
@ -58,6 +58,8 @@ public:
|
||||||
std::string GetHatButtonName(u8 direction_value) const override;
|
std::string GetHatButtonName(u8 direction_value) const override;
|
||||||
u8 GetHatButtonId(const std::string& direction_name) const override;
|
u8 GetHatButtonId(const std::string& direction_name) const override;
|
||||||
|
|
||||||
|
bool IsStickInverted(const Common::ParamPackage& params) override;
|
||||||
|
|
||||||
Common::Input::VibrationError SetRumble(
|
Common::Input::VibrationError SetRumble(
|
||||||
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
|
const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
|
||||||
|
|
||||||
|
|
|
@ -547,6 +547,22 @@ Common::Input::ButtonNames UDPClient::GetUIName(const Common::ParamPackage& para
|
||||||
return Common::Input::ButtonNames::Invalid;
|
return Common::Input::ButtonNames::Invalid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool UDPClient::IsStickInverted(const Common::ParamPackage& params) {
|
||||||
|
if (!params.Has("guid") || !params.Has("port") || !params.Has("pad")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const auto x_axis = static_cast<PadAxes>(params.Get("axis_x", 0));
|
||||||
|
const auto y_axis = static_cast<PadAxes>(params.Get("axis_y", 0));
|
||||||
|
if (x_axis != PadAxes::LeftStickY && x_axis != PadAxes::RightStickY) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (y_axis != PadAxes::LeftStickX && y_axis != PadAxes::RightStickX) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
void TestCommunication(const std::string& host, u16 port,
|
void TestCommunication(const std::string& host, u16 port,
|
||||||
const std::function<void()>& success_callback,
|
const std::function<void()>& success_callback,
|
||||||
const std::function<void()>& failure_callback) {
|
const std::function<void()>& failure_callback) {
|
||||||
|
|
|
@ -64,6 +64,8 @@ public:
|
||||||
MotionMapping GetMotionMappingForDevice(const Common::ParamPackage& params) override;
|
MotionMapping GetMotionMappingForDevice(const Common::ParamPackage& params) override;
|
||||||
Common::Input::ButtonNames GetUIName(const Common::ParamPackage& params) const override;
|
Common::Input::ButtonNames GetUIName(const Common::ParamPackage& params) const override;
|
||||||
|
|
||||||
|
bool IsStickInverted(const Common::ParamPackage& params) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum class PadButton {
|
enum class PadButton {
|
||||||
Undefined = 0x0000,
|
Undefined = 0x0000,
|
||||||
|
|
|
@ -157,6 +157,11 @@ public:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns true if axis of a stick aren't mapped in the correct direction
|
||||||
|
virtual bool IsStickInverted([[maybe_unused]] const Common::ParamPackage& params) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void PreSetController(const PadIdentifier& identifier);
|
void PreSetController(const PadIdentifier& identifier);
|
||||||
void PreSetButton(const PadIdentifier& identifier, int button);
|
void PreSetButton(const PadIdentifier& identifier, int button);
|
||||||
void PreSetHatButton(const PadIdentifier& identifier, int button);
|
void PreSetHatButton(const PadIdentifier& identifier, int button);
|
||||||
|
|
|
@ -241,6 +241,28 @@ struct InputSubsystem::Impl {
|
||||||
return Common::Input::ButtonNames::Invalid;
|
return Common::Input::ButtonNames::Invalid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool IsStickInverted(const Common::ParamPackage& params) {
|
||||||
|
const std::string engine = params.Get("engine", "");
|
||||||
|
if (engine == mouse->GetEngineName()) {
|
||||||
|
return mouse->IsStickInverted(params);
|
||||||
|
}
|
||||||
|
if (engine == gcadapter->GetEngineName()) {
|
||||||
|
return gcadapter->IsStickInverted(params);
|
||||||
|
}
|
||||||
|
if (engine == udp_client->GetEngineName()) {
|
||||||
|
return udp_client->IsStickInverted(params);
|
||||||
|
}
|
||||||
|
if (engine == tas_input->GetEngineName()) {
|
||||||
|
return tas_input->IsStickInverted(params);
|
||||||
|
}
|
||||||
|
#ifdef HAVE_SDL2
|
||||||
|
if (engine == sdl->GetEngineName()) {
|
||||||
|
return sdl->IsStickInverted(params);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
bool IsController(const Common::ParamPackage& params) {
|
bool IsController(const Common::ParamPackage& params) {
|
||||||
const std::string engine = params.Get("engine", "");
|
const std::string engine = params.Get("engine", "");
|
||||||
if (engine == mouse->GetEngineName()) {
|
if (engine == mouse->GetEngineName()) {
|
||||||
|
@ -384,6 +406,13 @@ bool InputSubsystem::IsController(const Common::ParamPackage& params) const {
|
||||||
return impl->IsController(params);
|
return impl->IsController(params);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool InputSubsystem::IsStickInverted(const Common::ParamPackage& params) const {
|
||||||
|
if (params.Has("axis_x") && params.Has("axis_y")) {
|
||||||
|
return impl->IsStickInverted(params);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void InputSubsystem::ReloadInputDevices() {
|
void InputSubsystem::ReloadInputDevices() {
|
||||||
impl->udp_client.get()->ReloadSockets();
|
impl->udp_client.get()->ReloadSockets();
|
||||||
}
|
}
|
||||||
|
|
|
@ -119,6 +119,9 @@ public:
|
||||||
/// Returns true if device is a controller.
|
/// Returns true if device is a controller.
|
||||||
[[nodiscard]] bool IsController(const Common::ParamPackage& params) const;
|
[[nodiscard]] bool IsController(const Common::ParamPackage& params) const;
|
||||||
|
|
||||||
|
/// Returns true if axis of a stick aren't mapped in the correct direction
|
||||||
|
[[nodiscard]] bool IsStickInverted(const Common::ParamPackage& device) const;
|
||||||
|
|
||||||
/// Reloads the input devices.
|
/// Reloads the input devices.
|
||||||
void ReloadInputDevices();
|
void ReloadInputDevices();
|
||||||
|
|
||||||
|
|
|
@ -489,6 +489,25 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i
|
||||||
[=, this](const Common::ParamPackage& params) {
|
[=, this](const Common::ParamPackage& params) {
|
||||||
Common::ParamPackage param = emulated_controller->GetStickParam(analog_id);
|
Common::ParamPackage param = emulated_controller->GetStickParam(analog_id);
|
||||||
SetAnalogParam(params, param, analog_sub_buttons[sub_button_id]);
|
SetAnalogParam(params, param, analog_sub_buttons[sub_button_id]);
|
||||||
|
// Correct axis direction for inverted sticks
|
||||||
|
if (input_subsystem->IsStickInverted(param)) {
|
||||||
|
switch (analog_id) {
|
||||||
|
case Settings::NativeAnalog::LStick: {
|
||||||
|
const bool invert_value = param.Get("invert_x", "+") == "-";
|
||||||
|
const std::string invert_str = invert_value ? "+" : "-";
|
||||||
|
param.Set("invert_x", invert_str);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case Settings::NativeAnalog::RStick: {
|
||||||
|
const bool invert_value = param.Get("invert_y", "+") == "-";
|
||||||
|
const std::string invert_str = invert_value ? "+" : "-";
|
||||||
|
param.Set("invert_y", invert_str);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
emulated_controller->SetStickParam(analog_id, param);
|
emulated_controller->SetStickParam(analog_id, param);
|
||||||
},
|
},
|
||||||
InputCommon::Polling::InputType::Stick);
|
InputCommon::Polling::InputType::Stick);
|
||||||
|
|
Reference in New Issue