WallyHackenslacker/lovedos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented Font:getWidth/getHeight()

Browse Source
This commit is contained in:
rxi
2016-09-23 19:23:56 +01:00
parent 9ed8ca8f01
commit 1940897a4a
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/font.c
View File

@@ -17,10 +17,6 @@
static const char *initFont(font_t *self, const void *data, int ptsize) { static const char *initFont(font_t *self, const void *data, int ptsize) {
int i; int i;
/* Init font's image */
int w = 128, h = 128;
retry:
image_initBlank(&self->image, w, h);
/* Init font */ /* Init font */
stbtt_fontinfo font; stbtt_fontinfo font;
@@ -28,11 +24,22 @@ retry:
return "could not load font"; return "could not load font";
} }
/* Get height and scale */
int ascent, descent, lineGap;
stbtt_GetFontVMetrics(&font, &ascent, &descent, &lineGap);
float scale = stbtt_ScaleForMappingEmToPixels(&font, ptsize);
self->height = (ascent - descent + lineGap) * scale;
/* Init image */
int w = 128, h = 128;
retry:
image_initBlank(&self->image, w, h);
/* Load glyphs */ /* Load glyphs */
float scale = stbtt_ScaleForMappingEmToPixels(&font, 1) / float s = stbtt_ScaleForMappingEmToPixels(&font, 1) /
stbtt_ScaleForPixelHeight(&font, 1); stbtt_ScaleForPixelHeight(&font, 1);
int res = stbtt_BakeFontBitmap( int res = stbtt_BakeFontBitmap(
data, 0, ptsize * scale, self->image.data, w, h, 0, 128, self->glyphs); data, 0, ptsize * s, self->image.data, w, h, 0, 128, self->glyphs);
/* Retry with a larger image buffer if the buffer wasn't large enough */ /* Retry with a larger image buffer if the buffer wasn't large enough */
if (res < 0) { if (res < 0) {
@@ -43,11 +50,9 @@ retry:
} }
/* Adjust glyph yoffsets */ /* Adjust glyph yoffsets */
int ascent; int scaledAscent = ascent * scale;
stbtt_GetFontVMetrics(&font, &ascent, NULL, NULL);
ascent *= stbtt_ScaleForMappingEmToPixels(&font, ptsize);
for (i = 0; i < 128; i++) { for (i = 0; i < 128; i++) {
self->glyphs[i].yoff += ascent; self->glyphs[i].yoff += scaledAscent;
} }
/* Init image data and mask */ /* Init image data and mask */
@@ -79,6 +84,7 @@ const char *font_init(font_t *self, const char *filename, int ptsize) {
data = dmt_malloc(sz); data = dmt_malloc(sz);
fread(data, sz, 1, fp); fread(data, sz, 1, fp);
fclose(fp); fclose(fp);
fp = NULL;
/* Init font */ /* Init font */
errmsg = initFont(self, data, ptsize); errmsg = initFont(self, data, ptsize);
@@ -168,12 +174,21 @@ int l_font_gc(lua_State *L) {
int l_font_getWidth(lua_State *L) { int l_font_getWidth(lua_State *L) {
return 0; font_t *self = luaobj_checkudata(L, 1, CLASS_TYPE);
const char *p = luaL_checkstring(L, 2);
int width = 0;
while (*p) {
width += self->glyphs[(int) (*p++ & 127)].xadvance;
}
lua_pushinteger(L, width);
return 1;
} }
int l_font_getHeight(lua_State *L) { int l_font_getHeight(lua_State *L) {
return 0; font_t *self = luaobj_checkudata(L, 1, CLASS_TYPE);
lua_pushinteger(L, self->height);
return 1;
} }

1
src/font.h
View File

@@ -14,6 +14,7 @@
typedef struct { typedef struct {
image_t image; image_t image;
stbtt_bakedchar glyphs[128]; stbtt_bakedchar glyphs[128];
int height;
} font_t; } font_t;
const char *font_init(font_t *self, const char *filename, int ptsize); const char *font_init(font_t *self, const char *filename, int ptsize);