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

Fixed dolphin/DEMOPuts.c

Browse source
This commit is contained in:
dbalatoni13 2024-11-12 04:48:22 +01:00
parent 4872ad3c62
commit 393303dca7
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.py
View file

@ -523,7 +523,7 @@ config.libs = [
[
Object(Matching, "dolphin/demo/DEMOInit.c"),
Object(Matching, "dolphin/demo/DEMOFont.c"),
Object(NonMatching, "dolphin/demo/DEMOPuts.c"),
Object(Matching, "dolphin/demo/DEMOPuts.c"),
Object(Matching, "dolphin/demo/DEMOStats.c"),
],
),

30
src/dolphin/demo/DEMOPuts.c
View file

@ -37,22 +37,22 @@ void DEMOSetFontType(DMFontType attr)
void DEMOLoadFont(enum _GXTexMapID texMap, enum _GXTexMtx texMtx, DMTexFlt texFlt)
{
// float fontTMtx[3][4];
// unsigned short width;
// unsigned short height;
float fontTMtx[3][4];
unsigned short width;
unsigned short height;
// width = 64;
// height = 0x1800 / width;
// GXInitTexObj(&fontTexObj, (void *)DEMOFontBitmap, width, (u16)height, 0, 0, 0, 0);
// if (texFlt == 0) {
// GXInitTexObjLOD(&fontTexObj, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f);
// fontShift = 0;
// }
// GXLoadTexObj(&fontTexObj, texMap);
// MTXScale(fontTMtx, 1.0f / (width - fontShift), 1.0f / ((u16)height - !fontShift), 1.0f);
// GXLoadTexMtxImm(fontTMtx, texMtx, 1);
// GXSetNumTexGens(1);
// GXSetTexCoordGen(0, 1, 4, texMtx);
width = 64;
height = 0x1800 / width;
GXInitTexObj(&fontTexObj, (void *)DEMOFontBitmap, width, (u16)height, 0, 0, 0, 0);
if (texFlt == 0) {
GXInitTexObjLOD(&fontTexObj, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f);
fontShift = 0;
}
GXLoadTexObj(&fontTexObj, texMap);
MTXScale(fontTMtx, 1.0f / width, 1.0f / height, 1.0f);
GXLoadTexMtxImm(fontTMtx, texMtx, 1);
GXSetNumTexGens(1);
GXSetTexCoordGen(0, 1, 4, texMtx);
}
void DEMOSetupScrnSpc(long width, long height, float depth)