X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=ft2.c;h=ce929355b3ba5e8c282651be10e2abf8dd43e449;hb=f1f794cceaae1a0687140f9a0c88eff3e858271a;hp=92630a38c940f4dffaed828fc487dec6ef4d1bbf;hpb=90f995e366f44806eed724459e0b6b219ffd1724;p=xonotic%2Fdarkplaces.git diff --git a/ft2.c b/ft2.c index 92630a38..ce929355 100644 --- a/ft2.c +++ b/ft2.c @@ -32,13 +32,9 @@ CVars introduced with the freetype extension ================================================================================ */ -cvar_t r_font_postprocess_blur = {CVAR_SAVE, "r_font_postprocess_blur", "0", "font blur amount"}; -cvar_t r_font_postprocess_outline = {CVAR_SAVE, "r_font_postprocess_outline", "0", "font outline amount"}; 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"}; @@ -148,13 +144,13 @@ typedef struct { unsigned char *buf, *buf2; int bufsize, bufwidth, bufheight, bufpitch; - double blur, outline; - int padding, blurpadding, outlinepadding; + 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 = {}; +static font_postprocess_t pp; /* ==================== @@ -272,13 +268,9 @@ void font_newmap(void) void Font_Init(void) { - Cvar_RegisterVariable(&r_font_postprocess_blur); - Cvar_RegisterVariable(&r_font_postprocess_outline); 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 @@ -320,11 +312,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; @@ -339,7 +333,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) { @@ -361,7 +355,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) { @@ -389,7 +383,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); @@ -442,7 +437,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]; @@ -464,6 +459,8 @@ 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); @@ -532,25 +529,34 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_font_t *font) return true; } -void Font_Postprocess_Update(int bpp, int w, int h) +void Font_Postprocess_Update(ft2_font_t *fnt, int bpp, int w, int h) { - qboolean need_gauss, need_circle; int needed, x, y; - double gausstable[2*POSTPROCESS_MAXRADIUS+1]; - if(!pp.buf || pp.blur != r_font_postprocess_blur.value) - need_gauss = true; - if(!pp.buf || pp.outline != r_font_postprocess_outline.value) - need_circle = true; - pp.blur = r_font_postprocess_blur.value; - pp.outline = r_font_postprocess_outline.value; - pp.outlinepadding = bound(0, ceil(pp.outline), POSTPROCESS_MAXRADIUS); - pp.blurpadding = bound(0, ceil(pp.blur), POSTPROCESS_MAXRADIUS); - pp.padding = pp.blurpadding + pp.outlinepadding; + 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) { - double sum = 0; + float sum = 0; for(x = -POSTPROCESS_MAXRADIUS; x <= POSTPROCESS_MAXRADIUS; ++x) - sum += (gausstable[POSTPROCESS_MAXRADIUS+x] = (pp.blur > 0 ? exp(-(x*x)/(pp.blur*pp.blur * 2)) : (x == 0))); + 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); } @@ -559,12 +565,12 @@ void Font_Postprocess_Update(int bpp, int w, int h) for(y = -POSTPROCESS_MAXRADIUS; y <= POSTPROCESS_MAXRADIUS; ++y) for(x = -POSTPROCESS_MAXRADIUS; x <= POSTPROCESS_MAXRADIUS; ++x) { - double d = pp.outline + 1 - sqrt(x*x + y*y); + 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 + 2 * pp.padding; - pp.bufheight = h + 2 * pp.padding; + 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) @@ -577,25 +583,25 @@ void Font_Postprocess_Update(int bpp, int w, int h) } } -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(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(bpp, w, h); + 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); - *pad_r = min(*pad_r, pp.padding); - *pad_t = min(*pad_t, pp.padding); - *pad_b = min(*pad_b, pp.padding); + *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)) // we can only do this in BGRA + 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 @@ -607,10 +613,10 @@ void Font_Postprocess(unsigned char *imagedata, int pitch, int bpp, int w, int h for(y = -*pad_t; y < h + *pad_b; ++y) for(x = -*pad_l; x < w + *pad_r; ++x) { - int x1 = max(-x, -pp.outlinepadding); - int y1 = max(-y, -pp.outlinepadding); - int x2 = min(pp.outlinepadding, w-1-x); - int y2 = min(pp.outlinepadding, h-1-y); + 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; @@ -621,36 +627,36 @@ void Font_Postprocess(unsigned char *imagedata, int pitch, int bpp, int w, int h if(cur > highest) highest = cur; } - pp.buf[((x + pp.padding) + pp.bufpitch * (y + pp.padding))] = (highest + 128) / 255; + pp.buf[((x + pp.padding_l) + pp.bufpitch * (y + pp.padding_t))] = (highest + 128) / 255; } // blur the outline buffer - if(pp.blur > 0) + 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); - int x2 = min(pp.blurpadding, pp.bufwidth-1-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] = blurred / 255; + 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); - int y2 = min(pp.blurpadding, pp.bufheight-1-y); + 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] = blurred / 255; + pp.buf[x + pp.bufpitch * y] = bound(0, blurred, 65025) / 255; } } @@ -658,7 +664,7 @@ void Font_Postprocess(unsigned char *imagedata, int pitch, int bpp, int w, int h 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) + pp.bufpitch * (y + pp.padding)]; + 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)]; @@ -676,13 +682,17 @@ void Font_Postprocess(unsigned char *imagedata, int pitch, int bpp, int w, int h } imagedata[x * bpp + pitch * y + (bpp - 1)] = newalpha; } + //imagedata[x * bpp + pitch * y + (bpp - 1)] |= 0x80; } } } else { // just calculate parameters - *pad_l = *pad_r = *pad_t = *pad_b = pp.padding; + *pad_l = pp.padding_l; + *pad_r = pp.padding_r; + *pad_t = pp.padding_t; + *pad_b = pp.padding_b; } } @@ -724,7 +734,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, 4, size*2, size*2, &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; @@ -1014,10 +1024,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; @@ -1034,7 +1044,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; @@ -1096,7 +1106,7 @@ static qboolean Font_LoadMap(ft2_font_t *font, ft2_font_map_t *mapstart, Uchar _ return false; } - Font_Postprocess(NULL, 0, bytesPerPixel, mapstart->size*2, mapstart->size*2, &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; @@ -1313,7 +1323,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, bytesPerPixel, w, h, &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]; @@ -1328,9 +1338,9 @@ 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;