nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-04-06 10:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

MENU: Draw Controller Glyphs on option

Browse source
This commit is contained in:
cypress 2024-10-20 10:56:33 -07:00
parent 611b8aafff
commit e170a04e16
5 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/menu/defs/menu_defs.qc
View file

@ -11,6 +11,14 @@ float menu_changetime;
float current_menu;
float running_platform;
float last_input_was_gamepad;
#ifdef MENU
float last_input_deviceid;
#endif // MENU
enum {
PLATFORM_WIN,
PLATFORM_MAC,

19
source/menu/m_menu.qc
View file

@ -334,6 +334,25 @@ float(string id, vector pos, vector size, string text) my_button =
return sui_is_clicked(id);
};
//
// Menu_DrawControllerGlyphDemo(order)
// Draws ABXY on the same line as an OptionVal to demonstrate
// the current cl_controllerglyphs value.
//
void(float order) Menu_DrawControllerGlyphDemo =
{
sui_set_align([SUI_ALIGN_START, SUI_ALIGN_START]);
vector tilemap_positions[4] = {[0, 0], [0.125, 0], [0.250, 0], [0.375, 0]};
vector position = [450, 50 + (order * 25)];
for(int i = 0; i < 4; i++) {
sui_subpic(position, [MENU_TEXT_MEDIUM_x, MENU_TEXT_MEDIUM_x], sprintf("gfx/controller_glyphs/%s.tga", cvar_string("cl_controllerglyphs")), [1, 1, 1], tilemap_positions[i], [0.125, 0.125], 1, 0);
position_x += 14;
}
};
//
// Menu_DrawCreditHeader()
// Wrapper for drawing the role/title in credits.

7
source/menu/main.qc
View file

@ -254,6 +254,13 @@ void() m_open =
float(float evtype, float scanx, float chary, float devid) Menu_InputEvent =
{
last_input_deviceid = devid;
if (last_input_deviceid > 0)
last_input_was_gamepad = TRUE;
else
last_input_was_gamepad = FALSE;
float used = sui_input_event(evtype, scanx, chary, devid);
if (evtype == IE_KEYDOWN && !used)

1
source/menu/menu_gpad.qc
View file

@ -100,6 +100,7 @@ void() Menu_Gamepad =
default: glyph_string = sprintf("USER (\"%s\")", cvar_string("cl_controllerglyphs")); break;
}
Menu_DrawOptionValue(1, glyph_string);
Menu_DrawControllerGlyphDemo(1);
Menu_Button(2, "gp_rumb", "RUMBLE", "Toggle Rumble during Gameplay Actions.") ? Menu_Gamepad_ApplyRumble() : 0;
string rumble_string = "";

6
source/menu/menu_main.qc
View file

@ -4,7 +4,7 @@ string() Menu_Main_GetDashboardName =
{
switch(running_platform) {
case PLATFORM_WIN: return "Windows";
case PLATFORM_MAC: return "MacOS";
case PLATFORM_MAC: return "macOS";
case PLATFORM_LIN: return "Linux";
case PLATFORM_XBX: return "Xbox Dashboard";
case PLATFORM_AND: return "Android";
@ -87,9 +87,9 @@ void() Menu_Main =
}
Menu_SocialBadge(1, "soc_youtube", "youtube.com/@nzpteam", 2);
Menu_SocialBadge(2, "soc_mastadon", "FIXME", 3);
Menu_SocialBadge(2, "soc_mastadon", "twitter.com/nzpteam", 3); // FIXME: Move to Mastadon
Menu_SocialBadge(3, "soc_patreon", "patreon.com/cypressimplex", 4);
Menu_SocialBadge(4, "soc_discord", "discord.nzp.gay", 1);
Menu_SocialBadge(4, "soc_matrix", "discord.nzp.gay", 1); // FIXME: Move to Matrix
sui_pop_frame();
};