TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

device: fix mappings for various generic gamepads on Windows

Browse Source 
See also #576
This commit is contained in:
rdb 2019-05-02 21:29:03 +02:00
parent cc4d5259cc
commit 7f0ac22ca5
1 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
panda/src/device/winRawInputDevice.cxx
View File

@ -32,6 +32,12 @@ enum QuirkBits : int {
// Throttle is reversed. // Throttle is reversed.
QB_reversed_throttle = 4, QB_reversed_throttle = 4,
// Right stick uses Z and Rz inputs.
QB_rstick_from_z = 8,
// Axes on the right stick are swapped, using x for y and vice versa.
QB_right_axes_swapped = 64,
}; };
// Some nonstandard gamepads have different button mappings. // Some nonstandard gamepads have different button mappings.
@ -42,12 +48,17 @@ static const struct DeviceMapping {
int quirks; int quirks;
const char *buttons[16]; const char *buttons[16];
} mapping_presets[] = { } mapping_presets[] = {
// SNES-style USB gamepad // SNES-style USB gamepad, or cheap unbranded USB gamepad with no sticks
// ABXY are mapped based on their position, not based on their label.
{0x0810, 0xe501, InputDevice::DeviceClass::gamepad, QB_no_analog_triggers, {0x0810, 0xe501, InputDevice::DeviceClass::gamepad, QB_no_analog_triggers,
{"face_x", "face_a", "face_b", "face_y", "lshoulder", "rshoulder", "none", "none", "back", "start"} {"face_y", "face_b", "face_a", "face_x", "lshoulder", "rshoulder", "ltrigger", "rtrigger", "back", "start"}
}, },
// SPEED Link SL-6535-SBK-01 // Unbranded generic cheap USB gamepad
{0x0079, 0x0006, InputDevice::DeviceClass::gamepad, QB_no_analog_triggers, {0x0810, 0x0001, InputDevice::DeviceClass::gamepad, QB_rstick_from_z | QB_no_analog_triggers | QB_right_axes_swapped,
{"face_y", "face_b", "face_a", "face_x", "lshoulder", "rshoulder", "ltrigger", "rtrigger", "back", "start", "lstick", "rstick"}
},
// Trust GXT 24 / SPEED Link SL-6535-SBK-01
{0x0079, 0x0006, InputDevice::DeviceClass::gamepad, QB_rstick_from_z | QB_no_analog_triggers,
{"face_y", "face_b", "face_a", "face_x", "lshoulder", "rshoulder", "ltrigger", "rtrigger", "back", "start", "lstick", "rstick"} {"face_y", "face_b", "face_a", "face_x", "lshoulder", "rshoulder", "ltrigger", "rtrigger", "back", "start", "lstick", "rstick"}
}, },
// T.Flight Hotas X // T.Flight Hotas X
@ -56,7 +67,7 @@ static const struct DeviceMapping {
}, },
// NVIDIA Shield Controller // NVIDIA Shield Controller
{0x0955, 0x7214, InputDevice::DeviceClass::gamepad, 0, {0x0955, 0x7214, InputDevice::DeviceClass::gamepad, 0,
{"face_a", "face_b", "n", "face_x", "face_y", "rshoulder", "lshoulder", "rshoulder", "e", "f", "g", "start", "h", "lstick", "rstick", "i"} {"face_a", "face_b", 0, "face_x", "face_y", "rshoulder", "lshoulder", "rshoulder", 0, 0, 0, "start", 0, "lstick", "rstick", 0}
}, },
{0}, {0},
}; };
@ -422,7 +433,14 @@ on_arrival(HANDLE handle, const RID_DEVICE_INFO &info, std::string name) {
break; break;
case HID_USAGE_GENERIC_Z: case HID_USAGE_GENERIC_Z:
if (_device_class == DeviceClass::gamepad) { if (_device_class == DeviceClass::gamepad) {
if ((quirks & QB_no_analog_triggers) == 0) { if (quirks & QB_rstick_from_z) {
if (quirks & QB_right_axes_swapped) {
axis = InputDevice::Axis::right_y;
swap(cap.LogicalMin, cap.LogicalMax);
} else {
axis = InputDevice::Axis::right_x;
}
} else if ((quirks & QB_no_analog_triggers) == 0) {
axis = Axis::left_trigger; axis = Axis::left_trigger;
} }
} else if (_device_class == DeviceClass::flight_stick) { } else if (_device_class == DeviceClass::flight_stick) {
@ -455,7 +473,14 @@ on_arrival(HANDLE handle, const RID_DEVICE_INFO &info, std::string name) {
break; break;
case HID_USAGE_GENERIC_RZ: case HID_USAGE_GENERIC_RZ:
if (_device_class == DeviceClass::gamepad) { if (_device_class == DeviceClass::gamepad) {
if ((quirks & QB_no_analog_triggers) == 0) { if (quirks & QB_rstick_from_z) {
if (quirks & QB_right_axes_swapped) {
axis = InputDevice::Axis::right_x;
} else {
axis = InputDevice::Axis::right_y;
swap(cap.LogicalMin, cap.LogicalMax);
}
} else if ((quirks & QB_no_analog_triggers) == 0) {
axis = Axis::right_trigger; axis = Axis::right_trigger;
} }
} else { } else {
@ -481,6 +506,16 @@ on_arrival(HANDLE handle, const RID_DEVICE_INFO &info, std::string name) {
break; break;
} }
// If this axis already exists, don't double-map it, but take the first
// one. This is important for the Trust GXT 24 / SL-6535-SBK-01 which
// have a weird extra Z axis with DataIndex 2 that should be ignored.
for (size_t i = 0; i < _axes.size(); ++i) {
if (_axes[i].axis == axis) {
axis = Axis::none;
break;
}
}
int axis_index; int axis_index;
if (!is_signed) { if (!is_signed) {
// All axes on the weird XInput-style mappings go from -1 to 1 // All axes on the weird XInput-style mappings go from -1 to 1