Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Change] Cleaned up font stuff somewhat.

Browse Source
This commit is contained in:
Allanis 2014-03-08 01:38:10 +00:00
parent 3e61178e6d
commit 8471f53cc2
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/font.c
View File

@ -17,8 +17,8 @@
#include "font.h" #include "font.h"
#include "ft2build.h" #include "ft2build.h"
#include <freetype2/freetype.h> #include FT_FREETYPE_H
#include <freetype2/ftglyph.h> #include FT_GLYPH_H
#include "lephisto.h" #include "lephisto.h"
#include "log.h" #include "log.h"
@ -427,25 +427,20 @@ int gl_printHeight(const glFont* ft_font, const int width,
*/ */
static void glFontMakeDList(FT_Face face, char ch, GLuint list_base, static void glFontMakeDList(FT_Face face, char ch, GLuint list_base,
GLuint* tex_base, int* width_base) { GLuint* tex_base, int* width_base) {
FT_Glyph glyph;
FT_Bitmap bitmap; FT_Bitmap bitmap;
GLubyte* expanded_data; GLubyte* expanded_data;
FT_GlyphSlot slot;
int w, h; int w, h;
int i, j; int i, j;
double x, y; double x, y;
if(FT_Load_Glyph(face, FT_Get_Char_Index(face, ch), slot = face->glyph; /* Small shortcut. */
FT_LOAD_DEFAULT))
WARN("FT_Load_Glyph failed");
if(FT_Get_Glyph(face->glyph, &glyph)) /* Load the glyph. */
WARN("FT_Ge_Glyph failed"); if(FT_Load_Char(face, ch, FT_LOAD_RENDER))
WARN("FT_Load_Char failed.");
/* Convert your glyph to a bitmap. */ bitmap = slot->bitmap; /* To simplify. */
FT_Glyph_To_Bitmap(&glyph, FT_RENDER_MODE_NORMAL, 0, 1);
FT_BitmapGlyph bitmap_glyph = (FT_BitmapGlyph)glyph;
bitmap = bitmap_glyph->bitmap; /* To simplify. */
/* Need the POT wrapping for GL. */ /* Need the POT wrapping for GL. */
w = gl_pot(bitmap.width); w = gl_pot(bitmap.width);
@ -476,7 +471,7 @@ static void glFontMakeDList(FT_Face face, char ch, GLuint list_base,
/* Corrects a spacing flaw between letters and */ /* Corrects a spacing flaw between letters and */
/* downwards correction for letters like g or y. */ /* downwards correction for letters like g or y. */
glPushMatrix(); glPushMatrix();
glTranslated(bitmap_glyph->left, bitmap_glyph->top-bitmap.rows, 0); glTranslated(slot->bitmap_left, slot->bitmap_top - bitmap.rows, 0);
/* Take the opengl POT wrapping into account. */ /* Take the opengl POT wrapping into account. */
x = (double)bitmap.width/(double)w; x = (double)bitmap.width/(double)w;
@ -496,14 +491,12 @@ static void glFontMakeDList(FT_Face face, char ch, GLuint list_base,
glEnd(); glEnd();
glPopMatrix(); glPopMatrix();
glTranslated(face->glyph->advance.x >> 6, 0,0); glTranslated(slot->advance.x >> 6, slot->advance.y >> 6, 0);
width_base[(int)ch] = (int)(face->glyph->advance.x >> 6); width_base[(int)ch] = slot->advance.x >> 6;
/* End of the display list. */ /* End of the display list. */
glEndList(); glEndList();
FT_Done_Glyph(glyph);
gl_checkErr(); gl_checkErr();
} }
@ -544,7 +537,15 @@ void gl_fontInit(glFont* font, const char* fname, const unsigned int h) {
WARN("FT_New_Memory_Face failed loading library from %s", fname); WARN("FT_New_Memory_Face failed loading library from %s", fname);
/* FreeType is pretty nice and measures using 1/64 of a pixel, therfore expand. */ /* FreeType is pretty nice and measures using 1/64 of a pixel, therfore expand. */
FT_Set_Char_Size(face, h << 6, h << 6, 96, 96); FT_Set_Char_Size(face,
0, /* Same as width. */
h << 6, /* In 1/64th of a pixel. */
96,
96);
/* Selected the character map. */
if(FT_Select_Charmap(face, FT_ENCODING_UNICODE))
WARN("FT_Select_Charmap failed to change character mapping.");
/* Have OpenGL allocate space for the textures / display lists. */ /* Have OpenGL allocate space for the textures / display lists. */
font->list_base = glGenLists(128); font->list_base = glGenLists(128);