Garhoogin/NitroPaint
1
Fork 0
mirror of https://github.com/Garhoogin/NitroPaint.git synced 2025-06-18 22:35:31 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up some font generation code

Browse Source
This commit is contained in:
Garhoogin 2025-05-07 00:50:07 -05:00 committed by GitHub
parent 734e932b22
commit f43d63d843
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
NitroPaint/nftr.c
View File

@ -993,6 +993,15 @@ static int NftrWriteBnfr20(NFTR *nftr, BSTREAM *stream) {
// ----- NFTR code mapping routines // ----- NFTR code mapping routines
#define NFTR_SIZE_FILE_HEADER 0x10
#define NFTR_SIZE_BLOCK_HEADER 0x08
#define NFTR_SIZE_FINF 0x1C
#define NFTR_SIZE_FINF_EX 0x20
#define NFTR_SIZE_CGLP_HEADER 0x10 // CGLP header plus block header
#define NFTR_SIZE_CWDH_HEADER 0x10 // CWDH header plus block header
#define NFTR_SIZE_CWDH_HEADER_GF 0x10 // GameFreak CWDH header plus block header
//structure used to sort the font glyphs by their width bytes //structure used to sort the font glyphs by their width bytes
typedef struct FontGlyphCpWidth_ { typedef struct FontGlyphCpWidth_ {
uint16_t cp; uint16_t cp;
@ -1537,7 +1546,7 @@ static unsigned int NftrCreateGfWidthBlock(NFTR *nftr, NnsStream *nns, StList *w
//emit //emit
if (nns != NULL) { if (nns != NULL) {
unsigned char header[0x10]; unsigned char header[NFTR_SIZE_CWDH_HEADER_GF];
memcpy(header, common, sizeof(common)); memcpy(header, common, sizeof(common));
*(uint32_t *) (header + 0x04) = sizeof(header); *(uint32_t *) (header + 0x04) = sizeof(header);
*(uint32_t *) (header + 0x08) = sizeof(header) + freqWidSize; *(uint32_t *) (header + 0x08) = sizeof(header) + freqWidSize;
@ -1729,13 +1738,13 @@ static int NftrWriteNftrCommon(NFTR *nftr, BSTREAM *stream) {
//determine cost savings by cutting this range //determine cost savings by cutting this range
unsigned int runCost = nRun * widEntrySize; unsigned int runCost = nRun * widEntrySize;
unsigned int splitCost = 0x10; unsigned int splitCost = NFTR_SIZE_CWDH_HEADER;
if (i == 0 || (i + nRun) == iOutGlyph) splitCost = 0; // no added block overhead to cut beginning/end if (i == 0 || (i + nRun) == iOutGlyph) splitCost = 0; // no added block overhead to cut beginning/end
if (runCost > splitCost) { if (runCost > splitCost) {
//compute amount saved (bytes omitted, less the size of block overhead) //compute amount saved (bytes omitted, less the size of block overhead)
unsigned int saved = runCost - splitCost; unsigned int saved = runCost - splitCost;
unsigned int curSaved = 0x12345678; unsigned int curSaved;
StMapGet(&savingMap, entryI, &curSaved); StMapGet(&savingMap, entryI, &curSaved);
curSaved += saved; curSaved += saved;
StMapPut(&savingMap, entryI, &curSaved); StMapPut(&savingMap, entryI, &curSaved);
@ -1784,7 +1793,7 @@ static int NftrWriteNftrCommon(NFTR *nftr, BSTREAM *stream) {
if (memcmp(entryI2, defWid, widEntrySize) == 0) { if (memcmp(entryI2, defWid, widEntrySize) == 0) {
//default width //default width
defCount++; defCount++;
if (defCount > (0x10 / widEntrySize)) { if (defCount > (NFTR_SIZE_CWDH_HEADER / widEntrySize)) {
break; break;
} }
} else { } else {
@ -1808,9 +1817,9 @@ static int NftrWriteNftrCommon(NFTR *nftr, BSTREAM *stream) {
bstreamFree(&widStream); bstreamFree(&widStream);
unsigned int finfSize = 0x1C; // constant unsigned int finfSize = NFTR_SIZE_FINF; // constant
unsigned int cglpSize = (0x10 + glyphStream.size + 3) & ~3; unsigned int cglpSize = (NFTR_SIZE_CGLP_HEADER + glyphStream.size + 3) & ~3;
unsigned int cwdhSize = 0x10 * listWidBlock.length; unsigned int cwdhSize = NFTR_SIZE_CWDH_HEADER * listWidBlock.length;
for (unsigned int i = 0; i < listWidBlock.length; i++) { for (unsigned int i = 0; i < listWidBlock.length; i++) {
FontGlyphWidBlock block; FontGlyphWidBlock block;
StListGet(&listWidBlock, i, &block); StListGet(&listWidBlock, i, &block);
@ -1820,19 +1829,23 @@ static int NftrWriteNftrCommon(NFTR *nftr, BSTREAM *stream) {
if (nftr->header.format == NFTR_TYPE_GF_NFTR_11) { if (nftr->header.format == NFTR_TYPE_GF_NFTR_11) {
//compute size //compute size
cwdhSize += 0x8 + NftrCreateGfWidthBlock(nftr, NULL, &widList); cwdhSize += NFTR_SIZE_BLOCK_HEADER + NftrCreateGfWidthBlock(nftr, NULL, &widList);
} }
unsigned int offsCglp = 0x10 + finfSize + 8; unsigned int offsCglp = NFTR_SIZE_FILE_HEADER + finfSize + NFTR_SIZE_BLOCK_HEADER;
unsigned int offsCwdh = 0x10 + finfSize + cglpSize + 8; unsigned int offsCwdh = NFTR_SIZE_FILE_HEADER + finfSize + cglpSize + NFTR_SIZE_BLOCK_HEADER;
unsigned int offsCmap = 0x10 + finfSize + cglpSize + cwdhSize + 8; unsigned int offsCmap = NFTR_SIZE_FILE_HEADER + finfSize + cglpSize + cwdhSize + NFTR_SIZE_BLOCK_HEADER;
if (nftr->header.format == NFTR_TYPE_NFTR_12) { if (nftr->header.format == NFTR_TYPE_NFTR_12) {
//increase size of FINF //increase size of FINF
offsCglp += 4; offsCglp += NFTR_SIZE_FINF_EX - NFTR_SIZE_FINF;
offsCwdh += 4; offsCwdh += NFTR_SIZE_FINF_EX - NFTR_SIZE_FINF;
offsCmap += 4; offsCmap += NFTR_SIZE_FINF_EX - NFTR_SIZE_FINF;
} }
//if data is not present, null the offsets to it.
if (cwdhSize == 0) offsCwdh = 0;
if (nftr->nGlyph == 0) offsCmap = 0;
//FINF block //FINF block
{ {
unsigned char finf[20] = { 0 }; unsigned char finf[20] = { 0 };