thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Descriptive input: expanded 6bt support

Browse source
This commit is contained in:
Antonio Martinez 2024-09-22 16:10:25 -07:00 • committed by AJ Martinez
parent bd1b4ac9c3
commit d1798c80fe
2 changed files with 68 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cvars.cpp
View file

@ -334,7 +334,15 @@ consvar_t cv_soundvolume = Player("soundvolume", "80").min_max(0, 100);
consvar_t cv_discordstreamer = Player("discordstreamer", "Off").on_off(); consvar_t cv_discordstreamer = Player("discordstreamer", "Off").on_off();
#endif #endif
consvar_t cv_descriptiveinput = Player("descriptiveinput", "Yes").yes_no(); // Display bound controls instead of Saturn buttons consvar_t cv_descriptiveinput = Player("descriptiveinput", "Modern")
.values({
{0, "Emulator"},
{1, "Modern"},
{2, "6Bt. (LB LT)"},
{3, "6Bt. (LT RT)"},
{4, "6bt. (LB RB)"},
}
); // Display bound controls instead of Saturn buttons
consvar_t cv_drawdist = Player("drawdist", "Normal").values({ consvar_t cv_drawdist = Player("drawdist", "Normal").values({
{3072, "Shortest"}, {3072, "Shortest"},

59
src/v_draw.cpp
View file

@ -143,6 +143,45 @@ Draw::TextElement& Draw::TextElement::parse(std::string_view raw)
{KEY_JOY1+8, 0x0B}, {KEY_JOY1+8, 0x0B},
}; };
// Saturn Type 1 - Retrobit Wired Dinput, RB RT LB LT
static const std::unordered_map<INT32, char> saturntype1 = {
{KEY_JOY1+0, 0x0A}, // ABXY
{KEY_JOY1+1, 0x0B},
{KEY_JOY1+2, 0x0D},
{KEY_JOY1+3, 0x0E},
{KEY_JOY1+9, 0x08}, // LBRB
{KEY_JOY1+10, 0x0C},
{KEY_AXIS1+8, 0x07}, // LTRT
{KEY_AXIS1+9, 0x0F},
{KEY_JOY1+6, 0x09}, // NAV
};
// Saturn Type 2 - Retrobit Wireless Dinput, LB RB LT RT
static const std::unordered_map<INT32, char> saturntype2 = {
{KEY_JOY1+0, 0x0A}, // ABXY
{KEY_JOY1+1, 0x0B},
{KEY_JOY1+2, 0x0D},
{KEY_JOY1+3, 0x0E},
{KEY_JOY1+9, 0x0C}, // LBRB
{KEY_JOY1+10, 0x0F},
{KEY_AXIS1+8, 0x08}, // LTRT
{KEY_AXIS1+9, 0x07},
{KEY_JOY1+6, 0x09}, // NAV
};
// Saturn Type 3 - Retrobit Wireless Xinput, RT LT LB RB
static const std::unordered_map<INT32, char> saturntype3 = {
{KEY_JOY1+0, 0x0A}, // ABXY
{KEY_JOY1+1, 0x0B},
{KEY_JOY1+2, 0x0D},
{KEY_JOY1+3, 0x0E},
{KEY_JOY1+9, 0x08}, // LBRB
{KEY_JOY1+10, 0x07},
{KEY_AXIS1+8, 0x0F}, // LTRT
{KEY_AXIS1+9, 0x0C},
{KEY_JOY1+6, 0x09}, // NAV
};
string_.clear(); string_.clear();
string_.reserve(raw.size()); string_.reserve(raw.size());
@ -209,10 +248,30 @@ Draw::TextElement& Draw::TextElement::parse(std::string_view raw)
INT32 bind = G_FindPlayerBindForGameControl(localplayer, id->second); INT32 bind = G_FindPlayerBindForGameControl(localplayer, id->second);
// EXTRA: descriptiveinput values above 1 translate binds back to Saturn buttons,
// with various modes for various fucked up 6bt pads
std::unordered_map<INT32, char> saturnconfig = {};
switch (cv_descriptiveinput.value)
{
case 2:
saturnconfig = saturntype1;
break;
case 3:
saturnconfig = saturntype2;
break;
case 4:
saturnconfig = saturntype3;
break;
}
if (auto pretty = prettyinputs.find(bind); pretty != prettyinputs.end()) // Gamepad direction or keyboard arrow, use something nice-looking if (auto pretty = prettyinputs.find(bind); pretty != prettyinputs.end()) // Gamepad direction or keyboard arrow, use something nice-looking
{ {
string_.push_back((it->second & 0xF0) | pretty->second); // original invocation has the animation bits, but the glyph bits come from the table string_.push_back((it->second & 0xF0) | pretty->second); // original invocation has the animation bits, but the glyph bits come from the table
} }
else if (auto st = saturnconfig.find(bind); st != saturnconfig.end())
{
string_.push_back((it->second & 0xF0) | st->second); // original invocation has the animation bits, but the glyph bits come from the table
}
else if (auto generic = genericinputs.find(bind); generic != genericinputs.end()) // Non-directional gamepad input, display it to the player as they are else if (auto generic = genericinputs.find(bind); generic != genericinputs.end()) // Non-directional gamepad input, display it to the player as they are
{ {
string_.push_back(0xEF); // Control code: "switch to descriptive input mode" - Saturn buttons will draw as generic gamepad buttons string_.push_back(0xEF); // Control code: "switch to descriptive input mode" - Saturn buttons will draw as generic gamepad buttons