mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2026-01-30 09:54:10 +03:00
Add controller button layout mappings
This adds mappings from SDL's Xbox-based SDL_GameControllerButton constants, to glyphs for the following layouts: - LAYOUT_NINTENDO_SWITCH_PRO, - LAYOUT_NINTENDO_SWITCH_JOYCON_L, - LAYOUT_NINTENDO_SWITCH_JOYCON_R, - LAYOUT_DECK, - LAYOUT_PLAYSTATION, - LAYOUT_XBOX, - LAYOUT_GENERIC, There may still be errors in these, but they should be mostly correct. I'm leaving it up to Ethan to make it show the correct button glyphs for the correct controllers being connected (and possibly to fix these mappings where needed).
This commit is contained in:
Dav999-v
committed by
Misa Elizabeth Kai
Misa Elizabeth Kai
parent
09365347b6
commit
e55e9efd9b
@@ -68,6 +68,74 @@ ButtonGlyphKey;
|
||||
|
||||
static char glyph[GLYPH_TOTAL][5];
|
||||
|
||||
typedef enum
|
||||
{
|
||||
LAYOUT_NINTENDO_SWITCH_PRO,
|
||||
LAYOUT_NINTENDO_SWITCH_JOYCON_L,
|
||||
LAYOUT_NINTENDO_SWITCH_JOYCON_R,
|
||||
LAYOUT_DECK,
|
||||
LAYOUT_PLAYSTATION,
|
||||
LAYOUT_XBOX,
|
||||
LAYOUT_GENERIC,
|
||||
|
||||
LAYOUT_TOTAL
|
||||
}
|
||||
ButtonGlyphLayout;
|
||||
|
||||
/* SDL provides Xbox buttons, we'd like to show the correct
|
||||
* (controller-specific) glyphs or labels for those... */
|
||||
static const char* glyph_layout[LAYOUT_TOTAL][SDL_CONTROLLER_BUTTON_RIGHTSHOULDER + 1] = {
|
||||
{ // NINTENDO_SWITCH_PRO
|
||||
glyph[GLYPH_NINTENDO_DECK_B], glyph[GLYPH_NINTENDO_DECK_A],
|
||||
glyph[GLYPH_NINTENDO_DECK_Y], glyph[GLYPH_NINTENDO_DECK_X],
|
||||
glyph[GLYPH_NINTENDO_MINUS], "HOME", glyph[GLYPH_NINTENDO_PLUS],
|
||||
glyph[GLYPH_NINTENDO_XBOX_LSTICK], glyph[GLYPH_NINTENDO_XBOX_RSTICK],
|
||||
glyph[GLYPH_NINTENDO_L], glyph[GLYPH_NINTENDO_R]
|
||||
},
|
||||
{ // NINTENDO_SWITCH_JOYCON_L
|
||||
glyph[GLYPH_NINTENDO_GENERIC_ACTIONDOWN], glyph[GLYPH_NINTENDO_GENERIC_ACTIONRIGHT],
|
||||
glyph[GLYPH_NINTENDO_GENERIC_ACTIONLEFT], glyph[GLYPH_NINTENDO_GENERIC_ACTIONUP],
|
||||
"CAPTURE", "GUIDE", glyph[GLYPH_NINTENDO_MINUS],
|
||||
glyph[GLYPH_NINTENDO_GENERIC_STICK], glyph[GLYPH_NINTENDO_XBOX_RSTICK],
|
||||
glyph[GLYPH_NINTENDO_SL], glyph[GLYPH_NINTENDO_SR]
|
||||
},
|
||||
{ // NINTENDO_SWITCH_JOYCON_R
|
||||
glyph[GLYPH_NINTENDO_GENERIC_ACTIONDOWN], glyph[GLYPH_NINTENDO_GENERIC_ACTIONRIGHT],
|
||||
glyph[GLYPH_NINTENDO_GENERIC_ACTIONLEFT], glyph[GLYPH_NINTENDO_GENERIC_ACTIONUP],
|
||||
"HOME", "GUIDE", glyph[GLYPH_NINTENDO_PLUS],
|
||||
glyph[GLYPH_NINTENDO_GENERIC_STICK], glyph[GLYPH_NINTENDO_XBOX_RSTICK],
|
||||
glyph[GLYPH_NINTENDO_SL], glyph[GLYPH_NINTENDO_SR]
|
||||
},
|
||||
{ // DECK
|
||||
glyph[GLYPH_NINTENDO_DECK_A], glyph[GLYPH_NINTENDO_DECK_B],
|
||||
glyph[GLYPH_NINTENDO_DECK_X], glyph[GLYPH_NINTENDO_DECK_Y],
|
||||
glyph[GLYPH_XBOX_DECK_VIEW], "GUIDE", glyph[GLYPH_XBOX_DECK_MENU],
|
||||
glyph[GLYPH_PLAYSTATION_DECK_L3], glyph[GLYPH_PLAYSTATION_DECK_R3],
|
||||
glyph[GLYPH_PLAYSTATION_DECK_L1], glyph[GLYPH_PLAYSTATION_DECK_R1]
|
||||
},
|
||||
{ // PLAYSTATION
|
||||
glyph[GLYPH_PLAYSTATION_CROSS], glyph[GLYPH_PLAYSTATION_CIRCLE],
|
||||
glyph[GLYPH_PLAYSTATION_SQUARE], glyph[GLYPH_PLAYSTATION_TRIANGLE],
|
||||
glyph[GLYPH_PLAYSTATION_OPTIONS], "PS", glyph[GLYPH_PLAYSTATION_START],
|
||||
glyph[GLYPH_PLAYSTATION_DECK_L3], glyph[GLYPH_PLAYSTATION_DECK_R3],
|
||||
glyph[GLYPH_PLAYSTATION_DECK_L1], glyph[GLYPH_PLAYSTATION_DECK_R1]
|
||||
},
|
||||
{ // XBOX
|
||||
glyph[GLYPH_XBOX_A], glyph[GLYPH_XBOX_B],
|
||||
glyph[GLYPH_XBOX_X], glyph[GLYPH_XBOX_Y],
|
||||
glyph[GLYPH_XBOX_DECK_VIEW], "GUIDE", glyph[GLYPH_XBOX_DECK_MENU],
|
||||
glyph[GLYPH_NINTENDO_XBOX_LSTICK], glyph[GLYPH_NINTENDO_XBOX_RSTICK],
|
||||
glyph[GLYPH_XBOX_LB], glyph[GLYPH_XBOX_RB]
|
||||
},
|
||||
{ // GENERIC
|
||||
glyph[GLYPH_NINTENDO_GENERIC_ACTIONDOWN], glyph[GLYPH_NINTENDO_GENERIC_ACTIONRIGHT],
|
||||
glyph[GLYPH_NINTENDO_GENERIC_ACTIONLEFT], glyph[GLYPH_NINTENDO_GENERIC_ACTIONUP],
|
||||
"SELECT", "GUIDE", "START",
|
||||
glyph[GLYPH_NINTENDO_XBOX_LSTICK], glyph[GLYPH_NINTENDO_XBOX_RSTICK],
|
||||
glyph[GLYPH_GENERIC_L], glyph[GLYPH_GENERIC_R]
|
||||
}
|
||||
};
|
||||
|
||||
void BUTTONGLYPHS_init(void)
|
||||
{
|
||||
/* Set glyph array to strings for all the button glyph codepoints (U+EBxx) */
|
||||
@@ -101,18 +169,57 @@ const char* BUTTONGLYPHS_get_wasd_text(void)
|
||||
return loc::gettext("Press left/right to move");
|
||||
}
|
||||
|
||||
const char* BUTTONGLYPHS_get_button(const ActionSet actionset, const Action action)
|
||||
static const char* sdlbutton_to_glyph(const SDL_GameControllerButton button)
|
||||
{
|
||||
if (button > SDL_CONTROLLER_BUTTON_RIGHTSHOULDER)
|
||||
{
|
||||
SDL_assert(0 && "Unhandled button!");
|
||||
return glyph[GLYPH_UNKNOWN];
|
||||
}
|
||||
|
||||
return glyph_layout[LAYOUT_PLAYSTATION][button];
|
||||
}
|
||||
|
||||
static const char* glyph_for_vector(
|
||||
const std::vector<SDL_GameControllerButton>& buttons,
|
||||
const int index
|
||||
) {
|
||||
if (index < 0 || index >= (int) buttons.size())
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return sdlbutton_to_glyph(buttons[index]);
|
||||
}
|
||||
|
||||
const char* BUTTONGLYPHS_get_button(const ActionSet actionset, const Action action, int binding)
|
||||
{
|
||||
/* Given a specific action (like INTERACT in-game),
|
||||
* return either a (localized) keyboard key string like "ENTER" or "E",
|
||||
* or a controller button glyph from the table above like glyph[GLYPH_XBOX_Y],
|
||||
* to fill into strings like "Press {button} to activate terminal". */
|
||||
* to fill into strings like "Press {button} to activate terminal".
|
||||
*
|
||||
* Normally, set binding = -1. This will return the best keyboard key OR controller glyph.
|
||||
*
|
||||
* If binding >= 0, select a specific CONTROLLER binding glyph,
|
||||
* or NULL if the index is higher than the max binding index. */
|
||||
|
||||
bool show_controller = binding >= 0 || !BUTTONGLYPHS_keyboard_is_active();
|
||||
if (binding < 0)
|
||||
{
|
||||
binding = 0;
|
||||
}
|
||||
|
||||
switch (actionset)
|
||||
{
|
||||
case ActionSet_Menu:
|
||||
switch (action.Menu)
|
||||
{
|
||||
case Action_Menu_Accept:
|
||||
if (show_controller)
|
||||
{
|
||||
return glyph_for_vector(game.controllerButton_flip, binding);
|
||||
}
|
||||
return loc::gettext("ACTION");
|
||||
}
|
||||
break;
|
||||
@@ -120,16 +227,43 @@ const char* BUTTONGLYPHS_get_button(const ActionSet actionset, const Action acti
|
||||
switch (action.InGame)
|
||||
{
|
||||
case Action_InGame_ACTION:
|
||||
if (show_controller)
|
||||
{
|
||||
return glyph_for_vector(game.controllerButton_flip, binding);
|
||||
}
|
||||
return loc::gettext("ACTION");
|
||||
|
||||
case Action_InGame_Interact:
|
||||
if (show_controller)
|
||||
{
|
||||
return glyph_for_vector(game.controllerButton_interact, binding);
|
||||
}
|
||||
if (game.separate_interact)
|
||||
{
|
||||
return "E";
|
||||
}
|
||||
return loc::gettext("ENTER");
|
||||
|
||||
case Action_InGame_Map:
|
||||
if (show_controller)
|
||||
{
|
||||
return glyph_for_vector(game.controllerButton_map, binding);
|
||||
}
|
||||
return loc::gettext("ENTER");
|
||||
|
||||
case Action_InGame_Esc:
|
||||
if (show_controller)
|
||||
{
|
||||
return glyph_for_vector(game.controllerButton_esc, binding);
|
||||
}
|
||||
return loc::gettext("ESC");
|
||||
|
||||
case Action_InGame_Restart:
|
||||
if (show_controller)
|
||||
{
|
||||
return glyph_for_vector(game.controllerButton_restart, binding);
|
||||
}
|
||||
return "R";
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -138,4 +272,40 @@ const char* BUTTONGLYPHS_get_button(const ActionSet actionset, const Action acti
|
||||
return glyph[GLYPH_UNKNOWN];
|
||||
}
|
||||
|
||||
char* BUTTONGLYPHS_get_all_gamepad_buttons(
|
||||
char* buffer,
|
||||
size_t buffer_len,
|
||||
const ActionSet actionset,
|
||||
const int action
|
||||
) {
|
||||
/* Gives a list of all controller bindings, for in the menu */
|
||||
Action union_action;
|
||||
union_action.intval = action;
|
||||
buffer[0] = '\0';
|
||||
size_t cur = 0;
|
||||
const char* glyph;
|
||||
int binding = 0;
|
||||
while ((glyph = BUTTONGLYPHS_get_button(actionset, union_action, binding)))
|
||||
{
|
||||
if (binding > 0 && buffer_len >= 1)
|
||||
{
|
||||
buffer[cur] = '/';
|
||||
cur++;
|
||||
buffer_len--;
|
||||
}
|
||||
|
||||
size_t glyph_len = SDL_strlcpy(&buffer[cur], glyph, buffer_len);
|
||||
if (glyph_len >= buffer_len)
|
||||
{
|
||||
// Truncation occurred, we're done
|
||||
return buffer;
|
||||
}
|
||||
cur += glyph_len;
|
||||
buffer_len -= glyph_len;
|
||||
|
||||
binding++;
|
||||
}
|
||||
return buffer;
|
||||
}
|
||||
|
||||
} // extern "C"
|
||||
|
||||
Reference in New Issue
Block a user