lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Glyph padding;

This commit is contained in:
bjorn 2017-07-15 01:53:05 +09:00
parent c7fceb5a60
commit 93c286afb6
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/graphics/font.c
View File

@ -115,13 +115,13 @@ void lovrFontPrint(Font* font, const char* str, mat4 transform, float wrap, Hori
// Triangles
if (glyph->w > 0 && glyph->h > 0) {
float x1 = cx + glyph->dx;
float y1 = cy + glyph->dy;
float x2 = x1 + glyph->w;
float y2 = y1 - glyph->h;
float x1 = cx + glyph->dx - GLYPH_PADDING;
float y1 = cy + glyph->dy + GLYPH_PADDING;
float x2 = x1 + glyph->tw;
float y2 = y1 - glyph->th;
float s1 = glyph->x / u;
float t1 = (glyph->y + glyph->h) / v;
float s2 = (glyph->x + glyph->w) / u;
float t1 = (glyph->y + glyph->th) / v;
float s2 = (glyph->x + glyph->tw) / u;
float t2 = glyph->y / v;
float vertices[30] = {
@ -269,14 +269,14 @@ void lovrFontAddGlyph(Font* font, Glyph* glyph) {
}
// If the glyph does not fit, you must acquit (new row)
if (atlas->x + glyph->w > atlas->width - 2 * atlas->padding) {
if (atlas->x + glyph->tw > atlas->width - 2 * atlas->padding) {
atlas->x = atlas->padding;
atlas->y += atlas->rowHeight + atlas->padding;
atlas->rowHeight = 0;
}
// Expand the texture if needed. Expanding the texture re-adds all the glyphs, so we can return.
if (atlas->y + glyph->h > atlas->height - 2 * atlas->padding) {
if (atlas->y + glyph->th > atlas->height - 2 * atlas->padding) {
lovrFontExpandTexture(font);
return;
}
@ -287,11 +287,11 @@ void lovrFontAddGlyph(Font* font, Glyph* glyph) {
// Paste glyph into texture
lovrGraphicsBindTexture(font->texture);
glTexSubImage2D(GL_TEXTURE_2D, 0, atlas->x, atlas->y, glyph->w, glyph->h, lovrTextureFormats[FORMAT_RGB].format, GL_UNSIGNED_BYTE, glyph->data);
glTexSubImage2D(GL_TEXTURE_2D, 0, atlas->x, atlas->y, glyph->tw, glyph->th, lovrTextureFormats[FORMAT_RGB].format, GL_UNSIGNED_BYTE, glyph->data);
// Advance atlas cursor
atlas->x += glyph->w + atlas->padding;
atlas->rowHeight = MAX(atlas->rowHeight, glyph->h);
atlas->x += glyph->tw + atlas->padding;
atlas->rowHeight = MAX(atlas->rowHeight, glyph->th);
}
void lovrFontExpandTexture(Font* font) {

8
src/loaders/font.c
View File

@ -128,15 +128,19 @@ void lovrFontDataLoadGlyph(FontData* fontData, uint32_t character, Glyph* glyph)
glyph->y = 0;
glyph->w = metrics->width >> 6;
glyph->h = metrics->height >> 6;
glyph->tw = glyph->w + 2 * GLYPH_PADDING;
glyph->th = glyph->h + 2 * GLYPH_PADDING;
glyph->dx = metrics->horiBearingX >> 6;
glyph->dy = metrics->horiBearingY >> 6;
glyph->advance = metrics->horiAdvance >> 6;
glyph->data = malloc(glyph->w * glyph->h * 3 * sizeof(uint8_t));
glyph->data = malloc(glyph->tw * glyph->th * 3 * sizeof(uint8_t));
// Render SDF
float tx = GLYPH_PADDING + -glyph->dx;
float ty = GLYPH_PADDING + glyph->h - glyph->dy;
msShapeNormalize(shape);
msEdgeColoringSimple(shape, 3.0, 0);
msGenerateMSDF(glyph->data, glyph->w, glyph->h, shape, fontData->size / 8., 1, 1, -glyph->dx, glyph->h - glyph->dy);
msGenerateMSDF(glyph->data, glyph->tw, glyph->th, shape, 4., 1, 1, tx, ty);
msShapeDestroy(shape);
}

4
src/loaders/font.h
View File

@ -4,6 +4,8 @@
#pragma once
#define GLYPH_PADDING 1
typedef struct {
void* rasterizer;
Blob* blob;
@ -18,6 +20,8 @@ typedef struct {
int y;
int w;
int h;
int tw;
int th;
int dx;
int dy;
int advance;