walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Minor text rendering code tweaks.

This commit is contained in:
Steve 2021-05-01 16:00:35 +01:00
parent 786df47e09
commit ef46a97a67
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/structs.h
View File

@ -43,7 +43,6 @@ typedef struct Tuple Tuple;
typedef struct Credit Credit; typedef struct Credit Credit;
typedef struct AtlasImage AtlasImage; typedef struct AtlasImage AtlasImage;
typedef struct Font Font; typedef struct Font Font;
typedef struct Glyph Glyph;
typedef struct { typedef struct {
int debug; int debug;

32
src/system/text.c
View File

@ -78,9 +78,7 @@ static void initFont(char *name, char *filename, char *characters)
i = 0; i = 0;
n = nextGlyph(characters, &i, glyphBuffer); while ((n = nextGlyph(characters, &i, glyphBuffer)) != 0)
while (n)
{ {
largest = MAX(largest, n); largest = MAX(largest, n);
@ -108,8 +106,6 @@ static void initFont(char *name, char *filename, char *characters)
SDL_FreeSurface(text); SDL_FreeSurface(text);
dest.x += dest.w; dest.x += dest.w;
n = nextGlyph(characters, &i, glyphBuffer);
} }
TTF_CloseFont(font); TTF_CloseFont(font);
@ -242,9 +238,7 @@ static void drawWord(char *word, int *x, int *y, int startX)
i = 0; i = 0;
n = nextGlyph(word, &i, NULL); while ((n = nextGlyph(word, &i, NULL)) != 0)
while (n)
{ {
dest.x = *x; dest.x = *x;
dest.y = *y; dest.y = *y;
@ -254,8 +248,6 @@ static void drawWord(char *word, int *x, int *y, int startX)
SDL_RenderCopy(app.renderer, activeFont->texture, &activeFont->glyphs[n], &dest); SDL_RenderCopy(app.renderer, activeFont->texture, &activeFont->glyphs[n], &dest);
*x += activeFont->glyphs[n].w * scale; *x += activeFont->glyphs[n].w * scale;
n = nextGlyph(word, &i, NULL);
} }
} }
@ -285,14 +277,10 @@ void calcTextDimensions(const char *text, int size, int *w, int *h)
i = 0; i = 0;
n = nextGlyph(text, &i, NULL); while ((n = nextGlyph(text, &i, NULL)) != 0)
while (n)
{ {
*w += activeFont->glyphs[n].w * scale; *w += activeFont->glyphs[n].w * scale;
*h = MAX(activeFont->glyphs[n].h * scale, *h); *h = MAX(activeFont->glyphs[n].h * scale, *h);
n = nextGlyph(text, &i, NULL);
} }
} }
@ -337,10 +325,11 @@ int getWrappedTextHeight(char *text, int size)
static int nextGlyph(const char *str, int *i, char *glyphBuffer) static int nextGlyph(const char *str, int *i, char *glyphBuffer)
{ {
int n, len; int len;
unsigned bit; unsigned bit;
const char *p;
bit = (unsigned char)str[*i]; bit = (unsigned char) str[*i];
if (bit < ' ') if (bit < ' ')
{ {
@ -377,11 +366,16 @@ static int nextGlyph(const char *str, int *i, char *glyphBuffer)
/* only fill the buffer if it's been supplied */ /* only fill the buffer if it's been supplied */
if (glyphBuffer != NULL) if (glyphBuffer != NULL)
{ {
p = str + *i;
memset(glyphBuffer, 0, MAX_GLYPH_SIZE); memset(glyphBuffer, 0, MAX_GLYPH_SIZE);
for (n = 0 ; n < len ; n++) memcpy(glyphBuffer, p, len);
if (bit >= MAX_GLYPHS)
{ {
glyphBuffer[n] = str[*i + n]; printf("Glyph '%s' index exceeds array size (%d >= %d)\n", glyphBuffer, bit, MAX_GLYPHS);
exit(1);
} }
} }