rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-24 12:42:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

IOQ3 commit 2230

Browse source
This commit is contained in:
Richard Allen 2012-10-04 13:52:24 +00:00
parent 413bbc7f93
commit 33defbaea3
1 changed files with 202 additions and 206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reaction/code/renderer/tr_font.c
View file

@ -92,7 +92,6 @@ static fontInfo_t registeredFont[MAX_FONTS];
#ifdef BUILD_FREETYPE #ifdef BUILD_FREETYPE
void R_GetGlyphInfo(FT_GlyphSlot glyph, int *left, int *right, int *width, int *top, int *bottom, int *height, int *pitch) { void R_GetGlyphInfo(FT_GlyphSlot glyph, int *left, int *right, int *width, int *top, int *bottom, int *height, int *pitch) {
*left = _FLOOR( glyph->metrics.horiBearingX ); *left = _FLOOR( glyph->metrics.horiBearingX );
*right = _CEIL( glyph->metrics.horiBearingX + glyph->metrics.width ); *right = _CEIL( glyph->metrics.horiBearingX + glyph->metrics.width );
*width = _TRUNC(*right - *left); *width = _TRUNC(*right - *left);
@ -105,7 +104,6 @@ void R_GetGlyphInfo(FT_GlyphSlot glyph, int *left, int *right, int *width, int *
FT_Bitmap *R_RenderGlyph(FT_GlyphSlot glyph, glyphInfo_t* glyphOut) { FT_Bitmap *R_RenderGlyph(FT_GlyphSlot glyph, glyphInfo_t* glyphOut) {
FT_Bitmap *bit2; FT_Bitmap *bit2;
int left, right, width, top, bottom, height, pitch, size; int left, right, width, top, bottom, height, pitch, size;
@ -136,8 +134,7 @@ FT_Bitmap *R_RenderGlyph(FT_GlyphSlot glyph, glyphInfo_t* glyphOut) {
glyphOut->bottom = bottom; glyphOut->bottom = bottom;
return bit2; return bit2;
} } else {
else {
ri.Printf(PRINT_ALL, "Non-outline fonts are not supported\n"); ri.Printf(PRINT_ALL, "Non-outline fonts are not supported\n");
} }
return NULL; return NULL;
@ -273,7 +270,6 @@ static glyphInfo_t *RE_ConstructGlyphInfo(unsigned char *imageOut, int *xOut, in
src += glyph.pitch; src += glyph.pitch;
dst += 256; dst += 256;
} }
} else { } else {
for (i = 0; i < glyph.height; i++) { for (i = 0; i < glyph.height; i++) {