kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Current progress with pfDrawFonts

Browse source
This commit is contained in:
gamemasterplc 2023-11-23 17:50:24 -06:00
parent 0845619572
commit 884ee1a8c5
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/printfunc.c
View file

@ -130,10 +130,12 @@ s16 printWin(s16 x, s16 y, s16 w, s16 h, GXColor *color)
void pfDrawFonts(void) void pfDrawFonts(void)
{ {
int i;
GXTexObj font_tex; GXTexObj font_tex;
Mtx44 proj; Mtx44 proj;
Mtx modelview; Mtx modelview;
int i;
s16 x, y, w, h;
u16 strline_count = strlinecnt; u16 strline_count = strlinecnt;
if(saftyFrameF) { if(saftyFrameF) {
WireDraw(); WireDraw();
@ -170,13 +172,12 @@ void pfDrawFonts(void)
GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP); GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP);
GXSetColorUpdate(GX_TRUE); GXSetColorUpdate(GX_TRUE);
for(i=0; i<256; i++) { for(i=0; i<256; i++) {
s16 x;
s16 y;
x = strline[i].x; x = strline[i].x;
y = strline[i].y; y = strline[i].y;
if(strline[i].type == 1) { if(strline[i].type == 1) {
s16 w = strline[i].w; w = strline[i].w;
s16 h = strline[i].h; h = strline[i].h;
GXClearVtxDesc(); GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT); GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_S16, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_S16, 0);
@ -193,6 +194,7 @@ void pfDrawFonts(void)
GXPosition2s16(x+w, y); GXPosition2s16(x+w, y);
GXPosition2s16(x+w, y+h); GXPosition2s16(x+w, y+h);
GXPosition2s16(x, y+h); GXPosition2s16(x, y+h);
GXEnd();
GXClearVtxDesc(); GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT); GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxDesc(GX_VA_CLR0, GX_INDEX8); GXSetVtxDesc(GX_VA_CLR0, GX_INDEX8);
@ -253,6 +255,7 @@ void pfDrawFonts(void)
GXPosition3s16(x, y+char_h, 0); GXPosition3s16(x, y+char_h, 0);
GXColor1x8(color); GXColor1x8(color);
GXTexCoord2f32(texcoord_x, texcoord_y+(1/16.0f)); GXTexCoord2f32(texcoord_x, texcoord_y+(1/16.0f));
GXEnd();
} else { } else {
GXBegin(GX_QUADS, GX_VTXFMT0, 8); GXBegin(GX_QUADS, GX_VTXFMT0, 8);
GXPosition3s16(x+shadow_ofs_x, y+shadow_ofs_y, 0); GXPosition3s16(x+shadow_ofs_x, y+shadow_ofs_y, 0);
@ -279,6 +282,7 @@ void pfDrawFonts(void)
GXPosition3s16(x, y+char_h, 0); GXPosition3s16(x, y+char_h, 0);
GXColor1x8(color); GXColor1x8(color);
GXTexCoord2f32(texcoord_x, texcoord_y+(1/16.0f)); GXTexCoord2f32(texcoord_x, texcoord_y+(1/16.0f));
GXEnd();
} }
x += char_w; x += char_w;
if(x > 640) { if(x > 640) {