Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removing some serious inefficiencies, fixing a change that broke compatibility with opengl < 3 #44

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

removing some serious inefficiencies, fixing a change that broke compatibility with opengl < 3 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d0ce55
removing completely insane and purposeless 64x horizontal scaling whi…
slowriot Sep 18, 2014
2b99444
Avoiding unloading the Freetype library and typeface during texture_f…
slowriot Sep 18, 2014
0267c9b
adding optional GL_ALPHA format as an alternative to the newly added …
slowriot Sep 18, 2014
7099658
adding brief documentation to the defines used in texture_atlas_upload
slowriot Sep 18, 2014
bf281ac
tweaking preprocessor defines to toggle between GL_ALPHA and GL_RED f…
slowriot Sep 18, 2014
77495cc
adding control to enable suppression of horizontal hinting, and separ…
slowriot Sep 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions texture-atlas.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ texture_atlas_set_region( texture_atlas_t * self,
charsize = sizeof(char);
for( i=0; i<height; ++i )
{
memcpy( self->data+((y+i)*self->width + x ) * charsize * depth,
memcpy( self->data+((y+i)*self->width + x ) * charsize * depth,
data + (i*stride) * charsize, width * charsize * depth );
}
}
Expand Down Expand Up @@ -230,7 +230,7 @@ texture_atlas_get_region( texture_atlas_t * self,
}
}
}

if( best_index == -1 )
{
region.x = -1;
Expand Down Expand Up @@ -338,8 +338,13 @@ texture_atlas_upload( texture_atlas_t * self )
}
else
{
#if !defined(GL_RED) || defined(FREETYPEGL_USE_GL_ALPHA)
glTexImage2D( GL_TEXTURE_2D, 0, GL_ALPHA, self->width, self->height,
0, GL_ALPHA, GL_UNSIGNED_BYTE, self->data );
#else
glTexImage2D( GL_TEXTURE_2D, 0, GL_RED, self->width, self->height,
0, GL_RED, GL_UNSIGNED_BYTE, self->data );
#endif
}
}

4 changes: 4 additions & 0 deletions texture-atlas.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ typedef struct texture_atlas_t
/**
* Upload atlas to video memory.
*
* Defines: GL_UNSIGNED_INT_8_8_8_8_REV: uploads a texture in this format if depth = 4
* FREETYPEGL_USE_GL_ALPHA: uses GL_ALPHA instead of GL_RED mode for depth == 1 rendering, needed for OpenGL < 3
* (this will also be enabled if GL_RED is not defined)
*
* @param self a texture atlas structure
*
*/
Expand Down
44 changes: 22 additions & 22 deletions texture-font.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#define HRES 64
#define HRESf 64.f
#define DPI 72
#define HHINT_SCALE 64

#undef __FTERRORS_H__
#define FT_ERRORDEF( e, v, s ) { e, s },
Expand All @@ -65,11 +66,7 @@ texture_font_load_face(texture_font_t *self, float size,
FT_Library *library, FT_Face *face)
{
FT_Error error;
FT_Matrix matrix = {
(int)((1.0/HRES) * 0x10000L),
(int)((0.0) * 0x10000L),
(int)((0.0) * 0x10000L),
(int)((1.0) * 0x10000L)};
FT_Matrix matrix_nohint = {(int)((1.0/HHINT_SCALE) * 0x10000L), 0, 0, 0x10000L};

assert(library);
assert(size);
Expand Down Expand Up @@ -112,7 +109,11 @@ texture_font_load_face(texture_font_t *self, float size,
}

/* Set char size */
error = FT_Set_Char_Size(*face, (int)(size * HRES), 0, DPI * HRES, DPI);
if(self->no_horizontal_hint) {
error = FT_Set_Char_Size(*face, (int)(size * HRES), 0, DPI * HHINT_SCALE, DPI);
} else {
error = FT_Set_Char_Size(*face, (int)(size * HRES), 0, DPI, DPI);
}

if(error) {
fprintf(stderr, "FT_Error (line %d, code 0x%02x) : %s\n",
Expand All @@ -122,8 +123,13 @@ texture_font_load_face(texture_font_t *self, float size,
return 0;
}

/* Set transform matrix */
FT_Set_Transform(*face, &matrix, NULL);
if(self->no_horizontal_hint) {
/* Set transform matrix to use the horizontally stretched one */
FT_Set_Transform(*face, &matrix_nohint, NULL);
} else {
/* Set transform matrix to identity */
FT_Set_Transform(*face, NULL, NULL);
}

return 1;
}
Expand Down Expand Up @@ -210,34 +216,30 @@ texture_glyph_get_kerning( const texture_glyph_t * self,

// ------------------------------------------ texture_font_generate_kerning ---
void
texture_font_generate_kerning( texture_font_t *self )
texture_font_generate_kerning( texture_font_t *self, FT_Face *face )
{
/* Assumes library and font are already loaded */

size_t i, j;
FT_Library library;
FT_Face face;
FT_UInt glyph_index, prev_index;
texture_glyph_t *glyph, *prev_glyph;
FT_Vector kerning;

assert( self );

/* Load font */
if(!texture_font_get_face(self, &library, &face))
return;

/* For each glyph couple combination, check if kerning is necessary */
/* Starts at index 1 since 0 is for the special backgroudn glyph */
for( i=1; i<self->glyphs->size; ++i )
{
glyph = *(texture_glyph_t **) vector_get( self->glyphs, i );
glyph_index = FT_Get_Char_Index( face, glyph->charcode );
glyph_index = FT_Get_Char_Index( *face, glyph->charcode );
vector_clear( glyph->kerning );

for( j=1; j<self->glyphs->size; ++j )
{
prev_glyph = *(texture_glyph_t **) vector_get( self->glyphs, j );
prev_index = FT_Get_Char_Index( face, prev_glyph->charcode );
FT_Get_Kerning( face, prev_index, glyph_index, FT_KERNING_UNFITTED, &kerning );
prev_index = FT_Get_Char_Index( *face, prev_glyph->charcode );
FT_Get_Kerning( *face, prev_index, glyph_index, FT_KERNING_UNFITTED, &kerning );
// printf("%c(%d)-%c(%d): %ld\n",
// prev_glyph->charcode, prev_glyph->charcode,
// glyph_index, glyph_index, kerning.x);
Expand All @@ -248,9 +250,6 @@ texture_font_generate_kerning( texture_font_t *self )
}
}
}

FT_Done_Face( face );
FT_Done_FreeType( library );
}

// ------------------------------------------------------ texture_font_init ---
Expand All @@ -276,6 +275,7 @@ texture_font_init(texture_font_t *self)
self->hinting = 1;
self->kerning = 1;
self->filtering = 1;
self->no_horizontal_hint = 0;

// FT_LCD_FILTER_LIGHT is (0x00, 0x55, 0x56, 0x55, 0x00)
// FT_LCD_FILTER_DEFAULT is (0x10, 0x40, 0x70, 0x40, 0x10)
Expand Down Expand Up @@ -640,10 +640,10 @@ texture_font_load_glyphs( texture_font_t * self,
FT_Done_Glyph( ft_glyph );
}
}
texture_font_generate_kerning( self, &face );
FT_Done_Face( face );
FT_Done_FreeType( library );
texture_atlas_upload( self->atlas );
texture_font_generate_kerning( self );
return missed;
}

Expand Down
8 changes: 8 additions & 0 deletions texture-font.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,14 @@ typedef struct texture_font_t
*/
int filtering;

/**
* Whether to discard horizontal hinting for better display at lower
* resolutions.
* See http://www.antigrain.com/research/font_rasterization/
* and http://jcgt.org/published/0002/01/04/
*/
int no_horizontal_hint;

/**
* Whether to use kerning if available
*/
Expand Down