X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=ft2.c;h=7a8b826a8204533a07dbf467ff411fd6c5b11404;hb=3dc7539384989ff69993911802634a1703f0143e;hp=1e1853d0b4fdc4b43ffcdd2ba1614f634e6060fe;hpb=c6f88b6f94206e34ed2e322c0f2aa9831714b017;p=xonotic%2Fdarkplaces.git diff --git a/ft2.c b/ft2.c index 1e1853d0..7a8b826a 100644 --- a/ft2.c +++ b/ft2.c @@ -35,8 +35,6 @@ CVars introduced with the freetype extension cvar_t r_font_disable_freetype = {CVAR_SAVE, "r_font_disable_freetype", "1", "disable freetype support for fonts entirely"}; cvar_t r_font_use_alpha_textures = {CVAR_SAVE, "r_font_use_alpha_textures", "0", "use alpha-textures for font rendering, this should safe memory"}; cvar_t r_font_size_snapping = {CVAR_SAVE, "r_font_size_snapping", "1", "stick to good looking font sizes whenever possible - bad when the mod doesn't support it!"}; -cvar_t r_font_hinting = {CVAR_SAVE, "r_font_hinting", "3", "0 = no hinting, 1 = light autohinting, 2 = full autohinting, 3 = full hinting"}; -cvar_t r_font_antialias = {CVAR_SAVE, "r_font_antialias", "1", "0 = monochrome, 1 = grey" /* , 2 = rgb, 3 = bgr" */}; cvar_t r_font_kerning = {CVAR_SAVE, "r_font_kerning", "1", "Use kerning if available"}; cvar_t developer_font = {CVAR_SAVE, "developer_font", "0", "prints debug messages about fonts"}; @@ -141,6 +139,19 @@ static rtexturepool_t *font_texturepool = NULL; /// FreeType library handle static FT_Library font_ft2lib = NULL; +#define POSTPROCESS_MAXRADIUS 8 +typedef struct +{ + unsigned char *buf, *buf2; + int bufsize, bufwidth, bufheight, bufpitch; + float blur, outline, shadowx, shadowy, shadowz; + int padding_t, padding_b, padding_l, padding_r, blurpadding_lt, blurpadding_rb, outlinepadding_t, outlinepadding_b, outlinepadding_l, outlinepadding_r; + unsigned char circlematrix[2*POSTPROCESS_MAXRADIUS+1][2*POSTPROCESS_MAXRADIUS+1]; + unsigned char gausstable[2*POSTPROCESS_MAXRADIUS+1]; +} +font_postprocess_t; +static font_postprocess_t pp; + /* ==================== Font_CloseLibrary @@ -160,6 +171,7 @@ void Font_CloseLibrary (void) font_ft2lib = NULL; } Sys_UnloadLibrary (&ft2_dll); + pp.buf = NULL; } /* @@ -239,12 +251,12 @@ void font_start(void) void font_shutdown(void) { int i; - for (i = 0; i < MAX_FONTS; ++i) + for (i = 0; i < dp_fonts.maxsize; ++i) { - if (dp_fonts[i].ft2) + if (dp_fonts.f[i].ft2) { - Font_UnloadFont(dp_fonts[i].ft2); - dp_fonts[i].ft2 = NULL; + Font_UnloadFont(dp_fonts.f[i].ft2); + dp_fonts.f[i].ft2 = NULL; } } Font_CloseLibrary(); @@ -259,10 +271,9 @@ void Font_Init(void) Cvar_RegisterVariable(&r_font_disable_freetype); Cvar_RegisterVariable(&r_font_use_alpha_textures); Cvar_RegisterVariable(&r_font_size_snapping); - Cvar_RegisterVariable(&r_font_hinting); - Cvar_RegisterVariable(&r_font_antialias); Cvar_RegisterVariable(&r_font_kerning); Cvar_RegisterVariable(&developer_font); + // let's open it at startup already Font_OpenLibrary(); } @@ -279,7 +290,7 @@ ft2_font_t *Font_Alloc(void) { if (!ft2_dll) return NULL; - return Mem_Alloc(font_mempool, sizeof(ft2_font_t)); + return (ft2_font_t *)Mem_Alloc(font_mempool, sizeof(ft2_font_t)); } qboolean Font_Attach(ft2_font_t *font, ft2_attachment_t *attachment) @@ -302,11 +313,13 @@ qboolean Font_Attach(ft2_font_t *font, ft2_attachment_t *attachment) float Font_VirtualToRealSize(float sz) { - int vh, vw, si; + int vh; + //int vw; + int si; float sn; if(sz < 0) return sz; - vw = ((vid.width > 0) ? vid.width : vid_width.value); + //vw = ((vid.width > 0) ? vid.width : vid_width.value); vh = ((vid.height > 0) ? vid.height : vid_height.value); // now try to scale to our actual size: sn = sz * vh / vid_conheight.value; @@ -321,7 +334,7 @@ float Font_SnapTo(float val, float snapwidth) return floor(val / snapwidth + 0.5f) * snapwidth; } -static qboolean Font_LoadFile(const char *name, int _face, ft2_font_t *font); +static qboolean Font_LoadFile(const char *name, int _face, ft2_settings_t *settings, ft2_font_t *font); static qboolean Font_LoadSize(ft2_font_t *font, float size, qboolean check_only); qboolean Font_LoadFont(const char *name, dp_font_t *dpfnt) { @@ -343,7 +356,7 @@ qboolean Font_LoadFont(const char *name, dp_font_t *dpfnt) break; } - if (!Font_LoadFile(name, dpfnt->req_face, ft2)) + if (!Font_LoadFile(name, dpfnt->req_face, &dpfnt->settings, ft2)) { if (i >= MAX_FONT_FALLBACKS) { @@ -371,7 +384,8 @@ qboolean Font_LoadFont(const char *name, dp_font_t *dpfnt) Con_Printf("Failed to allocate font for fallback %i of font %s\n", i, name); break; } - if (!Font_LoadFile(dpfnt->fallbacks[i], dpfnt->fallback_faces[i], fb)) + + if (!Font_LoadFile(dpfnt->fallbacks[i], dpfnt->fallback_faces[i], &dpfnt->settings, fb)) { Con_Printf("Failed to allocate font for fallback %i of font %s\n", i, name); Mem_Free(fb); @@ -424,7 +438,7 @@ qboolean Font_LoadFont(const char *name, dp_font_t *dpfnt) return true; } -static qboolean Font_LoadFile(const char *name, int _face, ft2_font_t *font) +static qboolean Font_LoadFile(const char *name, int _face, ft2_settings_t *settings, ft2_font_t *font) { size_t namelen; char filename[MAX_QPATH]; @@ -446,16 +460,26 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_font_t *font) return false; } + font->settings = settings; + namelen = strlen(name); - memcpy(filename, name, namelen); - memcpy(filename + namelen, ".ttf", 5); + // try load direct file + memcpy(filename, name, namelen+1); data = FS_LoadFile(filename, font_mempool, false, &datasize); + // try load .ttf + if (!data) + { + memcpy(filename + namelen, ".ttf", 5); + data = FS_LoadFile(filename, font_mempool, false, &datasize); + } + // try load .otf if (!data) { memcpy(filename + namelen, ".otf", 5); data = FS_LoadFile(filename, font_mempool, false, &datasize); } + // try load .pfb/afm if (!data) { ft2_attachment_t afm; @@ -472,13 +496,12 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_font_t *font) Font_Attach(font, &afm); } } - if (!data) { // FS_LoadFile being not-quiet should print an error :) return false; } - Con_Printf("Loading font %s face %i...\n", filename, _face); + Con_DPrintf("Loading font %s face %i...\n", filename, _face); status = qFT_New_Memory_Face(font_ft2lib, (FT_Bytes)data, datasize, _face, (FT_Face*)&font->face); if (status && _face != 0) @@ -504,7 +527,7 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_font_t *font) args.flags = FT_OPEN_MEMORY; args.memory_base = (const FT_Byte*)font->attachments[i].data; args.memory_size = font->attachments[i].size; - if (qFT_Attach_Stream(font->face, &args)) + if (qFT_Attach_Stream((FT_Face)font->face, &args)) Con_Printf("Failed to add attachment %u to %s\n", (unsigned)i, font->name); } @@ -514,17 +537,170 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_font_t *font) return true; } -void Font_Postprocess(unsigned char *imagedata, int pitch, int bpp, int w, int h, int *pad_l, int *pad_r, int *pad_t, int *pad_b) +void Font_Postprocess_Update(ft2_font_t *fnt, int bpp, int w, int h) +{ + int needed, x, y; + float gausstable[2*POSTPROCESS_MAXRADIUS+1]; + qboolean need_gauss = (!pp.buf || pp.blur != fnt->settings->blur || pp.shadowz != fnt->settings->shadowz); + qboolean need_circle = (!pp.buf || pp.outline != fnt->settings->outline || pp.shadowx != fnt->settings->shadowx || pp.shadowy != fnt->settings->shadowy); + pp.blur = fnt->settings->blur; + pp.outline = fnt->settings->outline; + pp.shadowx = fnt->settings->shadowx; + pp.shadowy = fnt->settings->shadowy; + pp.shadowz = fnt->settings->shadowz; + pp.outlinepadding_l = bound(0, ceil(pp.outline - pp.shadowx), POSTPROCESS_MAXRADIUS); + pp.outlinepadding_r = bound(0, ceil(pp.outline + pp.shadowx), POSTPROCESS_MAXRADIUS); + pp.outlinepadding_t = bound(0, ceil(pp.outline - pp.shadowy), POSTPROCESS_MAXRADIUS); + pp.outlinepadding_b = bound(0, ceil(pp.outline + pp.shadowy), POSTPROCESS_MAXRADIUS); + pp.blurpadding_lt = bound(0, ceil(pp.blur - pp.shadowz), POSTPROCESS_MAXRADIUS); + pp.blurpadding_rb = bound(0, ceil(pp.blur + pp.shadowz), POSTPROCESS_MAXRADIUS); + pp.padding_l = pp.blurpadding_lt + pp.outlinepadding_l; + pp.padding_r = pp.blurpadding_rb + pp.outlinepadding_r; + pp.padding_t = pp.blurpadding_lt + pp.outlinepadding_t; + pp.padding_b = pp.blurpadding_rb + pp.outlinepadding_b; + if(need_gauss) + { + float sum = 0; + for(x = -POSTPROCESS_MAXRADIUS; x <= POSTPROCESS_MAXRADIUS; ++x) + gausstable[POSTPROCESS_MAXRADIUS+x] = (pp.blur > 0 ? exp(-(pow(x + pp.shadowz, 2))/(pp.blur*pp.blur * 2)) : (floor(x + pp.shadowz + 0.5) == 0)); + for(x = -pp.blurpadding_rb; x <= pp.blurpadding_lt; ++x) + sum += gausstable[POSTPROCESS_MAXRADIUS+x]; + for(x = -POSTPROCESS_MAXRADIUS; x <= POSTPROCESS_MAXRADIUS; ++x) + pp.gausstable[POSTPROCESS_MAXRADIUS+x] = floor(gausstable[POSTPROCESS_MAXRADIUS+x] / sum * 255 + 0.5); + } + if(need_circle) + { + for(y = -POSTPROCESS_MAXRADIUS; y <= POSTPROCESS_MAXRADIUS; ++y) + for(x = -POSTPROCESS_MAXRADIUS; x <= POSTPROCESS_MAXRADIUS; ++x) + { + float d = pp.outline + 1 - sqrt(pow(x + pp.shadowx, 2) + pow(y + pp.shadowy, 2)); + pp.circlematrix[POSTPROCESS_MAXRADIUS+y][POSTPROCESS_MAXRADIUS+x] = (d >= 1) ? 255 : (d <= 0) ? 0 : floor(d * 255 + 0.5); + } + } + pp.bufwidth = w + pp.padding_l + pp.padding_r; + pp.bufheight = h + pp.padding_t + pp.padding_b; + pp.bufpitch = pp.bufwidth; + needed = pp.bufwidth * pp.bufheight; + if(!pp.buf || pp.bufsize < needed * 2) + { + if(pp.buf) + Mem_Free(pp.buf); + pp.bufsize = needed * 4; + pp.buf = (unsigned char *)Mem_Alloc(font_mempool, pp.bufsize); + pp.buf2 = pp.buf + needed; + } +} + +void Font_Postprocess(ft2_font_t *fnt, unsigned char *imagedata, int pitch, int bpp, int w, int h, int *pad_l, int *pad_r, int *pad_t, int *pad_b) { + int x, y; + Font_Postprocess_Update(fnt, bpp, w, h); if(imagedata) { + // enlarge buffer + // perform operation, not exceeding the passed padding values, // but possibly reducing them + *pad_l = min(*pad_l, pp.padding_l); + *pad_r = min(*pad_r, pp.padding_r); + *pad_t = min(*pad_t, pp.padding_t); + *pad_b = min(*pad_b, pp.padding_b); + + // calculate gauss table + + // outline the font (RGBA only) + if(bpp == 4 && (pp.outline > 0 || pp.blur > 0 || pp.shadowx != 0 || pp.shadowy != 0 || pp.shadowz != 0)) // we can only do this in BGRA + { + // this is like mplayer subtitle rendering + // bbuffer, bitmap buffer: this is our font + // abuffer, alpha buffer: this is pp.buf + // tmp: this is pp.buf2 + + // create outline buffer + memset(pp.buf, 0, pp.bufwidth * pp.bufheight); + for(y = -*pad_t; y < h + *pad_b; ++y) + for(x = -*pad_l; x < w + *pad_r; ++x) + { + int x1 = max(-x, -pp.outlinepadding_r); + int y1 = max(-y, -pp.outlinepadding_b); + int x2 = min(pp.outlinepadding_l, w-1-x); + int y2 = min(pp.outlinepadding_t, h-1-y); + int mx, my; + int cur = 0; + int highest = 0; + for(my = y1; my <= y2; ++my) + for(mx = x1; mx <= x2; ++mx) + { + cur = pp.circlematrix[POSTPROCESS_MAXRADIUS+my][POSTPROCESS_MAXRADIUS+mx] * (int)imagedata[(x+mx) * bpp + pitch * (y+my) + (bpp - 1)]; + if(cur > highest) + highest = cur; + } + pp.buf[((x + pp.padding_l) + pp.bufpitch * (y + pp.padding_t))] = (highest + 128) / 255; + } + + // blur the outline buffer + if(pp.blur > 0 || pp.shadowz != 0) + { + // horizontal blur + for(y = 0; y < pp.bufheight; ++y) + for(x = 0; x < pp.bufwidth; ++x) + { + int x1 = max(-x, -pp.blurpadding_rb); + int x2 = min(pp.blurpadding_lt, pp.bufwidth-1-x); + int mx; + int blurred = 0; + for(mx = x1; mx <= x2; ++mx) + blurred += pp.gausstable[POSTPROCESS_MAXRADIUS+mx] * (int)pp.buf[(x+mx) + pp.bufpitch * y]; + pp.buf2[x + pp.bufpitch * y] = bound(0, blurred, 65025) / 255; + } + + // vertical blur + for(y = 0; y < pp.bufheight; ++y) + for(x = 0; x < pp.bufwidth; ++x) + { + int y1 = max(-y, -pp.blurpadding_rb); + int y2 = min(pp.blurpadding_lt, pp.bufheight-1-y); + int my; + int blurred = 0; + for(my = y1; my <= y2; ++my) + blurred += pp.gausstable[POSTPROCESS_MAXRADIUS+my] * (int)pp.buf2[x + pp.bufpitch * (y+my)]; + pp.buf[x + pp.bufpitch * y] = bound(0, blurred, 65025) / 255; + } + } + + // paste the outline below the font + for(y = -*pad_t; y < h + *pad_b; ++y) + for(x = -*pad_l; x < w + *pad_r; ++x) + { + unsigned char outlinealpha = pp.buf[(x + pp.padding_l) + pp.bufpitch * (y + pp.padding_t)]; + if(outlinealpha > 0) + { + unsigned char oldalpha = imagedata[x * bpp + pitch * y + (bpp - 1)]; + // a' = 1 - (1 - a1) (1 - a2) + unsigned char newalpha = 255 - ((255 - (int)outlinealpha) * (255 - (int)oldalpha)) / 255; // this is >= oldalpha + // c' = (a2 c2 - a1 a2 c1 + a1 c1) / a' = (a2 c2 + a1 (1 - a2) c1) / a' + unsigned char oldfactor = (255 * (int)oldalpha) / newalpha; + //unsigned char outlinefactor = ((255 - oldalpha) * (int)outlinealpha) / newalpha; + int i; + for(i = 0; i < bpp-1; ++i) + { + unsigned char c = imagedata[x * bpp + pitch * y + i]; + c = (c * (int)oldfactor) / 255 /* + outlinecolor[i] * (int)outlinefactor */; + imagedata[x * bpp + pitch * y + i] = c; + } + imagedata[x * bpp + pitch * y + (bpp - 1)] = newalpha; + } + //imagedata[x * bpp + pitch * y + (bpp - 1)] |= 0x80; + } + } } else { - // calculate parameters - *pad_l = *pad_r = *pad_t = *pad_b = 0; + // just calculate parameters + *pad_l = pp.padding_l; + *pad_r = pp.padding_r; + *pad_t = pp.padding_t; + *pad_b = pp.padding_b; } } @@ -566,7 +742,7 @@ static qboolean Font_LoadSize(ft2_font_t *font, float size, qboolean check_only) return (Font_SearchSize(font, fontface, size) > 0); } - Font_Postprocess(NULL, 0, 0, 0, 0, &gpad_l, &gpad_r, &gpad_t, &gpad_b); + Font_Postprocess(font, NULL, 0, 4, size*2, size*2, &gpad_l, &gpad_r, &gpad_t, &gpad_b); memset(&temp, 0, sizeof(temp)); temp.size = size; @@ -597,9 +773,9 @@ static qboolean Font_LoadSize(ft2_font_t *font, float size, qboolean check_only) for (r = 0; r < 256; ++r) { FT_ULong ul, ur; - ul = qFT_Get_Char_Index(font->face, l); - ur = qFT_Get_Char_Index(font->face, r); - if (qFT_Get_Kerning(font->face, ul, ur, FT_KERNING_DEFAULT, &kernvec)) + ul = qFT_Get_Char_Index((FT_Face)font->face, l); + ur = qFT_Get_Char_Index((FT_Face)font->face, r); + if (qFT_Get_Kerning((FT_Face)font->face, ul, ur, FT_KERNING_DEFAULT, &kernvec)) { fmap->kerning.kerning[l][r][0] = 0; fmap->kerning.kerning[l][r][1] = 0; @@ -747,9 +923,9 @@ qboolean Font_GetKerningForMap(ft2_font_t *font, int map_index, float w, float h Con_Printf("Failed to get kerning for %s\n", font->name); return false; } - ul = qFT_Get_Char_Index(font->face, left); - ur = qFT_Get_Char_Index(font->face, right); - if (qFT_Get_Kerning(font->face, ul, ur, FT_KERNING_DEFAULT, &kernvec)) + ul = qFT_Get_Char_Index((FT_Face)font->face, left); + ur = qFT_Get_Char_Index((FT_Face)font->face, right); + if (qFT_Get_Kerning((FT_Face)font->face, ul, ur, FT_KERNING_DEFAULT, &kernvec)) { if (outx) *outx = Font_SnapTo(kernvec.x * fmap->sfx, 1 / fmap->size);// * (w / (float)fmap->size); if (outy) *outy = Font_SnapTo(kernvec.y * fmap->sfy, 1 / fmap->size);// * (h / (float)fmap->size); @@ -856,10 +1032,10 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ else fontface = (FT_Face)font->face; - switch(r_font_antialias.integer) + switch(font->settings->antialias) { case 0: - switch(r_font_hinting.integer) + switch(font->settings->hinting) { case 0: load_flags = FT_LOAD_NO_HINTING | FT_LOAD_NO_AUTOHINT | FT_LOAD_TARGET_MONO | FT_LOAD_MONOCHROME; @@ -876,7 +1052,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ break; default: case 1: - switch(r_font_hinting.integer) + switch(font->settings->hinting) { case 0: load_flags = FT_LOAD_NO_HINTING | FT_LOAD_NO_AUTOHINT | FT_LOAD_TARGET_NORMAL; @@ -931,14 +1107,14 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ return false; } - map = Mem_Alloc(font_mempool, sizeof(ft2_font_map_t)); + map = (ft2_font_map_t *)Mem_Alloc(font_mempool, sizeof(ft2_font_map_t)); if (!map) { Con_Printf("ERROR: Out of memory when loading fontmap for %s\n", font->name); return false; } - Font_Postprocess(NULL, 0, 0, 0, 0, &gpad_l, &gpad_r, &gpad_t, &gpad_b); + Font_Postprocess(font, NULL, 0, bytesPerPixel, mapstart->size*2, mapstart->size*2, &gpad_l, &gpad_r, &gpad_t, &gpad_b); // copy over the information map->size = mapstart->size; @@ -948,7 +1124,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ map->sfy = mapstart->sfy; pitch = map->glyphSize * FONT_CHARS_PER_LINE * bytesPerPixel; - data = Mem_Alloc(font_mempool, (FONT_CHAR_LINES * map->glyphSize) * pitch); + data = (unsigned char *)Mem_Alloc(font_mempool, (FONT_CHAR_LINES * map->glyphSize) * pitch); if (!data) { Con_Printf("ERROR: Failed to allocate memory for font %s size %g\n", font->name, map->size); @@ -1006,10 +1182,10 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ } imagedata = data + gR * pitch * map->glyphSize + gC * map->glyphSize * bytesPerPixel; - imagedata += gpad_t * pitch + gpad_l; + imagedata += gpad_t * pitch + gpad_l * bytesPerPixel; //status = qFT_Load_Char(face, ch, FT_LOAD_RENDER); // we need the glyphIndex - face = font->face; + face = (FT_Face)font->face; usefont = NULL; if (font->image_font && mapch == ch && img_fontmap[mapch]) { @@ -1026,7 +1202,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ if (!Font_SetSize(usefont, mapstart->intSize, mapstart->intSize)) continue; // try that glyph - face = usefont->face; + face = (FT_Face)usefont->face; glyphIndex = qFT_Get_Char_Index(face, ch); if (glyphIndex == 0) continue; @@ -1039,7 +1215,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ { //Con_Printf("failed to load fallback glyph for char %lx from font %s\n", (unsigned long)ch, font->name); // now we let it use the "missing-glyph"-glyph - face = font->face; + face = (FT_Face)font->face; glyphIndex = 0; } } @@ -1047,7 +1223,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ if (!usefont) { usefont = font; - face = font->face; + face = (FT_Face)font->face; status = qFT_Load_Glyph(face, glyphIndex, FT_LOAD_RENDER | load_flags); if (status) { @@ -1155,7 +1331,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ pad_r = gpad_r; pad_t = gpad_t; pad_b = gpad_b; - Font_Postprocess(imagedata, pitch, w, h, bytesPerPixel, &pad_l, &pad_r, &pad_t, &pad_b); + Font_Postprocess(font, imagedata, pitch, bytesPerPixel, w, h, &pad_l, &pad_r, &pad_t, &pad_b); // now fill map->glyphs[ch - map->start] mapglyph = &map->glyphs[mapch]; @@ -1170,17 +1346,17 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ //double mWidth = (glyph->metrics.width >> 6) / map->size; //double mHeight = (glyph->metrics.height >> 6) / map->size; - mapglyph->txmin = ( (double)(gC * map->glyphSize) ) / ( (double)(map->glyphSize * FONT_CHARS_PER_LINE) ); + mapglyph->txmin = ( (double)(gC * map->glyphSize) + (double)(gpad_l - pad_l) ) / ( (double)(map->glyphSize * FONT_CHARS_PER_LINE) ); mapglyph->txmax = mapglyph->txmin + (double)(bmp->width + pad_l + pad_r) / ( (double)(map->glyphSize * FONT_CHARS_PER_LINE) ); - mapglyph->tymin = ( (double)(gR * map->glyphSize) ) / ( (double)(map->glyphSize * FONT_CHAR_LINES) ); + mapglyph->tymin = ( (double)(gR * map->glyphSize) + (double)(gpad_r - pad_r) ) / ( (double)(map->glyphSize * FONT_CHAR_LINES) ); mapglyph->tymax = mapglyph->tymin + (double)(bmp->rows + pad_t + pad_b) / ( (double)(map->glyphSize * FONT_CHAR_LINES) ); //mapglyph->vxmin = bearingX; //mapglyph->vxmax = bearingX + mWidth; - mapglyph->vxmin = glyph->bitmap_left / map->size; + mapglyph->vxmin = (glyph->bitmap_left - pad_l) / map->size; mapglyph->vxmax = mapglyph->vxmin + (bmp->width + pad_l + pad_r) / map->size; // don't ask //mapglyph->vymin = -bearingY; //mapglyph->vymax = mHeight - bearingY; - mapglyph->vymin = -glyph->bitmap_top / map->size; + mapglyph->vymin = (-glyph->bitmap_top - pad_t) / map->size; mapglyph->vymax = mapglyph->vymin + (bmp->rows + pad_t + pad_b) / map->size; //Con_Printf("dpi = %f %f (%f %d) %d %d\n", bmp->width / (mapglyph->vxmax - mapglyph->vxmin), bmp->rows / (mapglyph->vymax - mapglyph->vymin), map->size, map->glyphSize, (int)fontface->size->metrics.x_ppem, (int)fontface->size->metrics.y_ppem); //mapglyph->advance_x = advance * usefont->size; @@ -1223,12 +1399,12 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ map->texture = R_LoadTexture2D(font_texturepool, map_identifier, map->glyphSize * FONT_CHARS_PER_LINE, map->glyphSize * FONT_CHAR_LINES, - data, TEXTYPE_ALPHA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, NULL); + data, TEXTYPE_ALPHA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, -1, NULL); } else { map->texture = R_LoadTexture2D(font_texturepool, map_identifier, map->glyphSize * FONT_CHARS_PER_LINE, map->glyphSize * FONT_CHAR_LINES, - data, TEXTYPE_RGBA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, NULL); + data, TEXTYPE_RGBA, TEXF_ALPHA /*gone: | TEXF_ALWAYSPRECACHE*/ /* | TEXF_MIPMAP*/, -1, NULL); } Mem_Free(data);