fries/GRRLIB
1
0
Fork 0
mirror of https://github.com/GRRLIB/GRRLIB.git synced 2024-11-26 08:42:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CHG] BMF function are a bit faster, character definition is taken inside an array

Browse source
This commit is contained in:
Crayon2000 2010-07-06 05:07:55 +00:00
parent 0432dd951c
commit cde17f778f
3 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
GRRLIB/GRRLIB/GRRLIB_bmf.c
View file

@ -27,6 +27,7 @@ THE SOFTWARE.
/** /**
* Load a ByteMap font structure from a buffer. * Load a ByteMap font structure from a buffer.
* File format version 1.1 is used, more information could be found at http://bmf.wz.cz/bmf-format.htm
* @param my_bmf The ByteMap font buffer to load. * @param my_bmf The ByteMap font buffer to load.
* @return A GRRLIB_bytemapFont structure filled with BMF information. * @return A GRRLIB_bytemapFont structure filled with BMF information.
* @see GRRLIB_FreeBMF * @see GRRLIB_FreeBMF
@ -34,7 +35,7 @@ THE SOFTWARE.
GRRLIB_bytemapFont* GRRLIB_LoadBMF (const u8 my_bmf[] ) { GRRLIB_bytemapFont* GRRLIB_LoadBMF (const u8 my_bmf[] ) {
GRRLIB_bytemapFont *fontArray = (struct GRRLIB_bytemapFont *)malloc(sizeof(GRRLIB_bytemapFont)); GRRLIB_bytemapFont *fontArray = (struct GRRLIB_bytemapFont *)malloc(sizeof(GRRLIB_bytemapFont));
u32 i, j = 1; u32 i, j = 1;
u8 lineheight, usedcolors, highestcolor, nbPalette; u8 lineheight, usedcolors, highestcolor, nbPalette, c;
short int sizeover, sizeunder, sizeinner, numcolpal; short int sizeover, sizeunder, sizeinner, numcolpal;
u16 nbPixels; u16 nbPixels;
@ -58,19 +59,18 @@ GRRLIB_bytemapFont* GRRLIB_LoadBMF (const u8 my_bmf[] ) {
memcpy(fontArray->name, &my_bmf[18 + numcolpal], j); memcpy(fontArray->name, &my_bmf[18 + numcolpal], j);
j = 18 + numcolpal + j; j = 18 + numcolpal + j;
fontArray->nbChar = (my_bmf[j] | my_bmf[j+1]<<8); fontArray->nbChar = (my_bmf[j] | my_bmf[j+1]<<8);
fontArray->charDef = (GRRLIB_bytemapChar *)calloc(fontArray->nbChar, sizeof(GRRLIB_bytemapChar));
j++; j++;
for (i=0; i < fontArray->nbChar; i++) { for (i=0; i < fontArray->nbChar; i++) {
fontArray->charDef[i].character = my_bmf[++j]; c = my_bmf[++j];
fontArray->charDef[i].width = my_bmf[++j]; fontArray->charDef[c].width = my_bmf[++j];
fontArray->charDef[i].height = my_bmf[++j]; fontArray->charDef[c].height = my_bmf[++j];
fontArray->charDef[i].relx = my_bmf[++j]; fontArray->charDef[c].relx = my_bmf[++j];
fontArray->charDef[i].rely = my_bmf[++j]; fontArray->charDef[c].rely = my_bmf[++j];
fontArray->charDef[i].kerning = my_bmf[++j]; fontArray->charDef[c].kerning = my_bmf[++j];
nbPixels = fontArray->charDef[i].width * fontArray->charDef[i].height; nbPixels = fontArray->charDef[c].width * fontArray->charDef[c].height;
fontArray->charDef[i].data = (u8 *)malloc(nbPixels); fontArray->charDef[c].data = (u8 *)malloc(nbPixels);
if (nbPixels && fontArray->charDef[i].data) { if (nbPixels && fontArray->charDef[c].data) {
memcpy(fontArray->charDef[i].data, &my_bmf[++j], nbPixels); memcpy(fontArray->charDef[c].data, &my_bmf[++j], nbPixels);
j += (nbPixels - 1); j += (nbPixels - 1);
} }
} }
@ -88,7 +88,6 @@ void GRRLIB_FreeBMF (const GRRLIB_bytemapFont *bmf) {
for (i=0; i<bmf->nbChar; i++) { for (i=0; i<bmf->nbChar; i++) {
free(bmf->charDef[i].data); free(bmf->charDef[i].data);
} }
free(bmf->charDef);
free(bmf->palette); free(bmf->palette);
free(bmf->name); free(bmf->name);
} }

28
GRRLIB/GRRLIB/GRRLIB_print.c
View file

@ -69,11 +69,12 @@ void GRRLIB_Printf (const f32 xpos, const f32 ypos,
void GRRLIB_PrintBMF (const f32 xpos, const f32 ypos, void GRRLIB_PrintBMF (const f32 xpos, const f32 ypos,
const GRRLIB_bytemapFont *bmf, const GRRLIB_bytemapFont *bmf,
const char *text, ...) { const char *text, ...) {
uint i, n, size; uint i, size;
u16 j; u8 *pdata;
u8 x, y; u8 x, y;
char tmp[1024]; char tmp[1024];
f32 xoff = xpos; f32 xoff = xpos;
const GRRLIB_bytemapChar *pchar;
va_list argp; va_list argp;
va_start(argp, text); va_start(argp, text);
@ -81,22 +82,17 @@ void GRRLIB_PrintBMF (const f32 xpos, const f32 ypos,
va_end(argp); va_end(argp);
for (i=0; i<size; i++) { for (i=0; i<size; i++) {
for (j=0; j<bmf->nbChar; j++) { pchar = &bmf->charDef[(u8)tmp[i]];
if (tmp[i] == bmf->charDef[j].character) { pdata = pchar->data;
n=0; for (y=0; y<pchar->height; y++) {
for (y=0; y<bmf->charDef[j].height; y++) { for (x=0; x<pchar->width; x++) {
for (x=0; x<bmf->charDef[j].width; x++) { if (*pdata++) {
if (bmf->charDef[j].data[n]) { GRRLIB_Plot(xoff + x + pchar->relx,
GRRLIB_Plot(xoff + x + bmf->charDef[j].relx, ypos + y + pchar->rely,
ypos + y + bmf->charDef[j].rely, bmf->palette[*pdata]);
bmf->palette[bmf->charDef[j].data[n]]);
}
n++;
} }
} }
xoff += bmf->charDef[j].kerning + bmf->tracking;
break;
}
} }
xoff += pchar->kerning + bmf->tracking;
} }
} }

3
GRRLIB/GRRLIB/grrlib.h
View file

@ -130,7 +130,6 @@ typedef struct GRRLIB_texImg {
* Structure to hold the bytemap character information. * Structure to hold the bytemap character information.
*/ */
typedef struct GRRLIB_bytemapChar { typedef struct GRRLIB_bytemapChar {
u8 character; /**< Character identity. */
u8 width; /**< Character width. */ u8 width; /**< Character width. */
u8 height; /**< Character height. */ u8 height; /**< Character height. */
s8 relx; /**< Horizontal offset relative to cursor (-128 to 127). */ s8 relx; /**< Horizontal offset relative to cursor (-128 to 127). */
@ -150,7 +149,7 @@ typedef struct GRRLIB_bytemapFont {
u8 version; /**< Version. */ u8 version; /**< Version. */
s8 tracking; /**< Tracking (Add-space after each char) (-128 to 127). */ s8 tracking; /**< Tracking (Add-space after each char) (-128 to 127). */
GRRLIB_bytemapChar *charDef; /**< Array of bitmap characters. */ GRRLIB_bytemapChar charDef[256]; /**< Array of bitmap characters. */
} GRRLIB_bytemapFont; } GRRLIB_bytemapFont;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------