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

Actually use the animation bits, dummy!

Browse source
This commit is contained in:
Antonio Martinez 2024-09-16 04:14:18 -07:00 • committed by AJ Martinez
parent af4dc813e2
commit 28221df0e9
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/v_draw.cpp
View file

@ -99,8 +99,7 @@ Draw::TextElement& Draw::TextElement::parse(std::string_view raw)
{0x0F, gc_z}, {0x0F, gc_z},
}; };
// What physical binds should always be rewritten as glyphs anyway? // What physical binds should be rewritten as base Saturn icons?
static const std::unordered_map<INT32, char> prettyinputs = { static const std::unordered_map<INT32, char> prettyinputs = {
{KEY_UPARROW, 0x00}, {KEY_UPARROW, 0x00},
{KEY_DOWNARROW, 0x01}, {KEY_DOWNARROW, 0x01},
@ -116,18 +115,19 @@ Draw::TextElement& Draw::TextElement::parse(std::string_view raw)
{KEY_AXIS1+3, 0x01}, // Down {KEY_AXIS1+3, 0x01}, // Down
}; };
// What physical binds should be rewritten as generic icons?
static const std::unordered_map<INT32, char> genericinputs = { static const std::unordered_map<INT32, char> genericinputs = {
{KEY_JOY1+0, 0x00}, {KEY_JOY1+0, 0x00}, // ABXY
{KEY_JOY1+1, 0x01}, {KEY_JOY1+1, 0x01},
{KEY_JOY1+2, 0x02}, {KEY_JOY1+2, 0x02},
{KEY_JOY1+3, 0x03}, {KEY_JOY1+3, 0x03},
{KEY_JOY1+9, 0x04}, {KEY_JOY1+9, 0x04}, // LBRB
{KEY_JOY1+10, 0x05}, {KEY_JOY1+10, 0x05},
{KEY_AXIS1+8, 0x06}, {KEY_AXIS1+8, 0x06}, // LTRT
{KEY_AXIS1+9, 0x07}, {KEY_AXIS1+9, 0x07},
{KEY_JOY1+6, 0x08}, {KEY_JOY1+6, 0x08}, // NAV
{KEY_JOY1+4, 0x09}, {KEY_JOY1+4, 0x09},
{KEY_JOY1+7, 0x0A}, {KEY_JOY1+7, 0x0A}, // CLICK
{KEY_JOY1+8, 0x0B}, {KEY_JOY1+8, 0x0B},
}; };
@ -175,16 +175,15 @@ Draw::TextElement& Draw::TextElement::parse(std::string_view raw)
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(0xB0 | pretty->second); // take high bits from glyph invoked and low bits from control 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 generic = genericinputs.find(bind); generic != genericinputs.end()) // Gamepad direction or keyboard arrow, use something nice-looking else if (auto generic = genericinputs.find(bind); generic != genericinputs.end()) // Gamepad input, display it to the player as they are
{ {
string_.push_back(0xEF); string_.push_back(0xEF);
string_.push_back(0xB0 | generic->second); // take high bits from glyph invoked and low bits from control string_.push_back((it->second & 0xF0) | generic->second); // original invocation has the animation bits, but the glyph bits come from the table
} }
else else
{ {
// string_.append("\x8D");
string_.push_back('\xEE'); string_.push_back('\xEE');
if (bind == -1) if (bind == -1)
@ -193,8 +192,6 @@ Draw::TextElement& Draw::TextElement::parse(std::string_view raw)
string_.append((G_KeynumToShortString(bind))); string_.append((G_KeynumToShortString(bind)));
string_.push_back('\xEE'); string_.push_back('\xEE');
// string_.append("\x80");
} }
} }
else // This is a color code or some other generic glyph, treat it as is. else // This is a color code or some other generic glyph, treat it as is.