Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support SDL2 half axes and inverted axes mappings. #38151

Merged
merged 3 commits into from
May 13, 2020
Merged

Support SDL2 half axes and inverted axes mappings. #38151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1176e07
Parse SDL game controller half axis and inverted axis entries.
madmiraal Apr 23, 2020
e7fee71
Update game controller enums.
madmiraal Apr 23, 2020
e0d4e84
Implement half axis and inverted axis mapping.
madmiraal May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 57 additions & 76 deletions core/global_constants.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ static Vector<_GlobalConstant> _global_constants;
VARIANT_ENUM_CAST(KeyList);
VARIANT_ENUM_CAST(KeyModifierMask);
VARIANT_ENUM_CAST(ButtonList);
VARIANT_ENUM_CAST(JoystickList);
VARIANT_ENUM_CAST(JoyButtonList);
VARIANT_ENUM_CAST(JoyAxisList);
VARIANT_ENUM_CAST(MidiMessageList);

void register_global_constants() {
Expand Down Expand Up @@ -388,90 +389,70 @@ void register_global_constants() {
BIND_GLOBAL_ENUM_CONSTANT(BUTTON_MASK_XBUTTON1);
BIND_GLOBAL_ENUM_CONSTANT(BUTTON_MASK_XBUTTON2);

//joypads
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_0);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_1);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_2);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_3);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_4);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_5);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_6);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_7);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_8);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_9);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_10);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_11);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_12);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_13);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_14);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_15);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_MAX);

BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_CIRCLE);
// Joypad buttons
BIND_GLOBAL_ENUM_CONSTANT(JOY_INVALID_BUTTON);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_A);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_B);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_X);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_Y);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_BACK);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_GUIDE);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_START);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_LEFT_STICK);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_RIGHT_STICK);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_LEFT_SHOULDER);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_RIGHT_SHOULDER);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_DPAD_UP);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_DPAD_DOWN);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_DPAD_LEFT);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_DPAD_RIGHT);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SDL_BUTTONS);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_X);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_CROSS);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_CIRCLE);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_SQUARE);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_TRIANGLE);

BIND_GLOBAL_ENUM_CONSTANT(JOY_XBOX_B);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_SELECT);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_START);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_PS);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_L1);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_R1);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_L3);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SONY_R3);
BIND_GLOBAL_ENUM_CONSTANT(JOY_XBOX_A);
BIND_GLOBAL_ENUM_CONSTANT(JOY_XBOX_B);
BIND_GLOBAL_ENUM_CONSTANT(JOY_XBOX_X);
BIND_GLOBAL_ENUM_CONSTANT(JOY_XBOX_Y);
BIND_GLOBAL_ENUM_CONSTANT(JOY_XBOX_BACK);
BIND_GLOBAL_ENUM_CONSTANT(JOY_XBOX_START);
BIND_GLOBAL_ENUM_CONSTANT(JOY_XBOX_HOME);
BIND_GLOBAL_ENUM_CONSTANT(JOY_XBOX_LS);
BIND_GLOBAL_ENUM_CONSTANT(JOY_XBOX_RS);
BIND_GLOBAL_ENUM_CONSTANT(JOY_XBOX_LB);
BIND_GLOBAL_ENUM_CONSTANT(JOY_XBOX_RB);
BIND_GLOBAL_ENUM_CONSTANT(JOY_BUTTON_MAX);

BIND_GLOBAL_ENUM_CONSTANT(JOY_DS_A);
BIND_GLOBAL_ENUM_CONSTANT(JOY_DS_B);
BIND_GLOBAL_ENUM_CONSTANT(JOY_DS_X);
BIND_GLOBAL_ENUM_CONSTANT(JOY_DS_Y);

BIND_GLOBAL_ENUM_CONSTANT(JOY_VR_GRIP);
BIND_GLOBAL_ENUM_CONSTANT(JOY_VR_PAD);
BIND_GLOBAL_ENUM_CONSTANT(JOY_VR_TRIGGER);
Copy link
Member

@aaronfranke aaronfranke May 13, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So now the VR values are just gone? I use these, I would appreciate them staying in the engine...

EDIT: I can re-add these myself if you want.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you have documentation on how the VR buttons and axes map onto the SDL buttons and axes? I removed them, because I didn't know how the mapped. The old values were limited to these three and they didn't make sense. Furthermore, not only has the order of the enums changed to align with the "official" SDL values, triggers are now axes and not buttons; so simply giving them the old values won't work either.

Copy link
Member

@aaronfranke aaronfranke May 14, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand what you mean. My HTC Vive's triggers are dual-stage, same with my Steam controller. They are both buttons and axes.

If this PR removed support for such things, that's absolutely terrible and I think this part should be reverted. I don't see why adding half-axes requires removing dual-stage triggers.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR implements the SDL mappings as SDL does. If your controller's triggers have two functions then my assumption is this would be reflected in their mappings. If not, then I'm missing something. It would be appreciated if you could test your controllers and provide feedback so things can be fixed if needed.


BIND_GLOBAL_ENUM_CONSTANT(JOY_OCULUS_AX);
BIND_GLOBAL_ENUM_CONSTANT(JOY_OCULUS_BY);
BIND_GLOBAL_ENUM_CONSTANT(JOY_OCULUS_MENU);

BIND_GLOBAL_ENUM_CONSTANT(JOY_OPENVR_MENU);

BIND_GLOBAL_ENUM_CONSTANT(JOY_SELECT);
BIND_GLOBAL_ENUM_CONSTANT(JOY_START);
BIND_GLOBAL_ENUM_CONSTANT(JOY_DPAD_UP);
BIND_GLOBAL_ENUM_CONSTANT(JOY_DPAD_DOWN);
BIND_GLOBAL_ENUM_CONSTANT(JOY_DPAD_LEFT);
BIND_GLOBAL_ENUM_CONSTANT(JOY_DPAD_RIGHT);
BIND_GLOBAL_ENUM_CONSTANT(JOY_L);
BIND_GLOBAL_ENUM_CONSTANT(JOY_L2);
BIND_GLOBAL_ENUM_CONSTANT(JOY_L3);
BIND_GLOBAL_ENUM_CONSTANT(JOY_R);
BIND_GLOBAL_ENUM_CONSTANT(JOY_R2);
BIND_GLOBAL_ENUM_CONSTANT(JOY_R3);

BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_0);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_1);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_2);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_3);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_4);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_5);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_6);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_7);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_8);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_9);
// Joypad axes
BIND_GLOBAL_ENUM_CONSTANT(JOY_INVALID_AXIS);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_LEFT_X);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_LEFT_Y);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_RIGHT_X);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_RIGHT_Y);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_TRIGGER_LEFT);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_TRIGGER_RIGHT);
BIND_GLOBAL_ENUM_CONSTANT(JOY_SDL_AXES);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_0_X);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_0_Y);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_1_X);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_1_Y);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_2_X);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_2_Y);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_3_X);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_3_Y);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_4_X);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_4_Y);
BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_MAX);

BIND_GLOBAL_ENUM_CONSTANT(JOY_ANALOG_LX);
BIND_GLOBAL_ENUM_CONSTANT(JOY_ANALOG_LY);

BIND_GLOBAL_ENUM_CONSTANT(JOY_ANALOG_RX);
BIND_GLOBAL_ENUM_CONSTANT(JOY_ANALOG_RY);

BIND_GLOBAL_ENUM_CONSTANT(JOY_ANALOG_L2);
BIND_GLOBAL_ENUM_CONSTANT(JOY_ANALOG_R2);

BIND_GLOBAL_ENUM_CONSTANT(JOY_VR_ANALOG_TRIGGER);
BIND_GLOBAL_ENUM_CONSTANT(JOY_VR_ANALOG_GRIP);

BIND_GLOBAL_ENUM_CONSTANT(JOY_OPENVR_TOUCHPADX);
BIND_GLOBAL_ENUM_CONSTANT(JOY_OPENVR_TOUCHPADY);

// midi
BIND_GLOBAL_ENUM_CONSTANT(MIDI_MESSAGE_NOTE_OFF);
BIND_GLOBAL_ENUM_CONSTANT(MIDI_MESSAGE_NOTE_ON);
Expand Down
Loading