mirror of
https://github.com/luksamuk/engine-psx.git
synced 2025-04-28 13:28:02 +03:00
Add < and > characters to BIG font
This commit is contained in:
parent
05c8bc2c2f
commit
ebe45952c6
4 changed files with 10 additions and 17 deletions
Binary file not shown.
Binary file not shown.
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 5.7 KiB |
|
@ -20,7 +20,6 @@ void font_flush();
|
||||||
void font_draw_big(const char *text, int16_t vx, int16_t vy);
|
void font_draw_big(const char *text, int16_t vx, int16_t vy);
|
||||||
void font_draw_sm(const char *text, int16_t vx, int16_t vy);
|
void font_draw_sm(const char *text, int16_t vx, int16_t vy);
|
||||||
void font_draw_hg(const char *text, int16_t vx, int16_t vy);
|
void font_draw_hg(const char *text, int16_t vx, int16_t vy);
|
||||||
void font_draw_logo(int16_t vx, int16_t vy, uint16_t w, uint16_t h);
|
|
||||||
|
|
||||||
uint16_t font_measurew_big(const char *text);
|
uint16_t font_measurew_big(const char *text);
|
||||||
uint16_t font_measurew_sm(const char *text);
|
uint16_t font_measurew_sm(const char *text);
|
||||||
|
|
|
@ -56,6 +56,8 @@ static uint8_t glyph_info_big[] = {
|
||||||
0xff, 0, 0, 0, // = (no char)
|
0xff, 0, 0, 0, // = (no char)
|
||||||
0xff, 0, 0, 0, // ! (no char)
|
0xff, 0, 0, 0, // ! (no char)
|
||||||
0xff, 0, 0, 0, // ? (no char)
|
0xff, 0, 0, 0, // ? (no char)
|
||||||
|
115, 11, 6, 11, // <
|
||||||
|
121, 11, 6, 11, // >
|
||||||
};
|
};
|
||||||
|
|
||||||
static uint8_t glyph_info_sm[] = {
|
static uint8_t glyph_info_sm[] = {
|
||||||
|
@ -107,6 +109,8 @@ static uint8_t glyph_info_sm[] = {
|
||||||
103, 29, 6, 7, // =
|
103, 29, 6, 7, // =
|
||||||
110, 29, 4, 7, // !
|
110, 29, 4, 7, // !
|
||||||
115, 29, 7, 7, // ?
|
115, 29, 7, 7, // ?
|
||||||
|
0xff, 0, 0, 0, // < (no char)
|
||||||
|
0xff, 0, 0, 0, // > (no char)
|
||||||
};
|
};
|
||||||
|
|
||||||
static uint8_t glyph_info_hg[] = {
|
static uint8_t glyph_info_hg[] = {
|
||||||
|
@ -159,6 +163,8 @@ static uint8_t glyph_info_hg[] = {
|
||||||
0xff, 0, 0, 0, // =
|
0xff, 0, 0, 0, // =
|
||||||
0xff, 0, 0, 0, // !
|
0xff, 0, 0, 0, // !
|
||||||
0xff, 0, 0, 0, // ?
|
0xff, 0, 0, 0, // ?
|
||||||
|
0xff, 0, 0, 0, // < (no char)
|
||||||
|
0xff, 0, 0, 0, // > (no char)
|
||||||
};
|
};
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -203,22 +209,6 @@ _draw_glyph(
|
||||||
sort_prim(sprt, OTZ_LAYER_HUD);
|
sort_prim(sprt, OTZ_LAYER_HUD);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
font_draw_logo(
|
|
||||||
int16_t vx, int16_t vy,
|
|
||||||
uint16_t w, uint16_t h)
|
|
||||||
{
|
|
||||||
POLY_FT4 *poly = get_next_prim();
|
|
||||||
setPolyFT4(poly);
|
|
||||||
setRGB0(poly, font_color[0], font_color[1], font_color[2]);
|
|
||||||
increment_prim(sizeof(POLY_FT4));
|
|
||||||
setXYWH(poly, vx, vy, w, h);
|
|
||||||
setUVWH(poly, 0, 195, 160, 60);
|
|
||||||
poly->tpage = getTPage(font_mode & 0x3, 1, 960, 256);
|
|
||||||
poly->clut = getClut(0, 490);
|
|
||||||
sort_prim(poly, OTZ_LAYER_HUD);
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t
|
uint16_t
|
||||||
_font_measurew_generic(const char *text,
|
_font_measurew_generic(const char *text,
|
||||||
const uint8_t ws_w,
|
const uint8_t ws_w,
|
||||||
|
@ -260,6 +250,8 @@ _font_measurew_generic(const char *text,
|
||||||
case '=': offset = 40; break;
|
case '=': offset = 40; break;
|
||||||
case '!': offset = 41; break;
|
case '!': offset = 41; break;
|
||||||
case '?': offset = 42; break;
|
case '?': offset = 42; break;
|
||||||
|
case '<': offset = 43; break;
|
||||||
|
case '>': offset = 44; break;
|
||||||
default: offset = 0xff; break;
|
default: offset = 0xff; break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -345,6 +337,8 @@ _font_draw_generic(const char *text, int16_t vx, int16_t vy,
|
||||||
case '=': offset = 40; break;
|
case '=': offset = 40; break;
|
||||||
case '!': offset = 41; break;
|
case '!': offset = 41; break;
|
||||||
case '?': offset = 42; break;
|
case '?': offset = 42; break;
|
||||||
|
case '<': offset = 43; break;
|
||||||
|
case '>': offset = 44; break;
|
||||||
default: offset = 0xff; break;
|
default: offset = 0xff; break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue