unsigned char *buf, *buf2;
int bufsize, bufwidth, bufheight, bufpitch;
float blur, outline, shadowx, shadowy, shadowz;
- int padding, blurpadding, outlinepadding;
+ 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;
/*
====================
const char* dllnames [] =
{
#if defined(WIN32)
- "freetype6.dll",
"libfreetype-6.dll",
+ "freetype6.dll",
#elif defined(MACOSX)
"libfreetype.6.dylib",
"libfreetype.dylib",
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();
Cvar_RegisterVariable(&r_font_size_snapping);
Cvar_RegisterVariable(&r_font_kerning);
Cvar_RegisterVariable(&developer_font);
+
// let's open it at startup already
Font_OpenLibrary();
}
{
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)
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;
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);
+ if(!FS_FileExists(va("%s.tga", dpfnt->fallbacks[i])))
+ if(!FS_FileExists(va("%s.png", dpfnt->fallbacks[i])))
+ if(!FS_FileExists(va("%s.jpg", dpfnt->fallbacks[i])))
+ if(!FS_FileExists(va("%s.pcx", dpfnt->fallbacks[i])))
+ Con_Printf("Failed to load font %s for fallback %i of font %s\n", dpfnt->fallbacks[i], i, name);
Mem_Free(fb);
- break;
+ continue;
}
count = 0;
for (s = 0; s < MAX_FONT_SIZES && dpfnt->req_sizes[s] >= 0; ++s)
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;
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)
_face = 0;
status = qFT_New_Memory_Face(font_ft2lib, (FT_Bytes)data, datasize, 0, (FT_Face*)&font->face);
}
+ font->data = data;
if (status)
{
Con_Printf("ERROR: can't create face for %s\n"
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);
}
void Font_Postprocess_Update(ft2_font_t *fnt, int bpp, int w, int h)
{
- qboolean need_gauss, need_circle;
int needed, x, y;
float gausstable[2*POSTPROCESS_MAXRADIUS+1];
- if(!pp.buf || pp.blur != fnt->settings->blur || pp.shadowz != fnt->settings->shadowz)
- need_gauss = true;
- if(!pp.buf || pp.outline != fnt->settings->outline || pp.shadowx != fnt->settings->shadowx || pp.shadowy != fnt->settings->shadowy)
- need_circle = true;
+ 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 = bound(0, ceil(pp.outline) + ceil(max(max(pp.shadowx, pp.shadowy), max(-pp.shadowx, -pp.shadowy))), POSTPROCESS_MAXRADIUS);
- pp.blurpadding = bound(0, ceil(pp.blur) + ceil(max(pp.shadowz, -pp.shadowz)), POSTPROCESS_MAXRADIUS);
- // FIXME for high values of shadow, we can do better by doing different x and y padding...
- pp.padding = pp.blurpadding + pp.outlinepadding;
+ 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)
- sum += (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)));
+ 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);
}
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)
if(pp.buf)
Mem_Free(pp.buf);
pp.bufsize = needed * 4;
- pp.buf = Mem_Alloc(font_mempool, pp.bufsize);
+ pp.buf = (unsigned char *)Mem_Alloc(font_mempool, pp.bufsize);
pp.buf2 = pp.buf + needed;
}
}
// 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
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;
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
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;
}
}
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)];
}
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;
}
}
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;
int Font_IndexForSize(ft2_font_t *font, float _fsize, float *outw, float *outh)
{
int match = -1;
- int value = 1000000;
- int nval;
+ float value = 1000000;
+ float nval;
int matchsize = -10000;
int m;
float fsize_x, fsize_y;
if (!maps[m])
continue;
// "round up" to the bigger size if two equally-valued matches exist
- nval = 0.5 * (abs(maps[m]->size - fsize_x) + abs(maps[m]->size - fsize_y));
+ nval = 0.5 * (fabs(maps[m]->size - fsize_x) + fabs(maps[m]->size - fsize_y));
if (match == -1 || nval < value || (nval == value && matchsize < maps[m]->size))
{
value = nval;
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);
void Font_UnloadFont(ft2_font_t *font)
{
int i;
+
+ // unload fallbacks
+ if(font->next)
+ Font_UnloadFont(font->next);
+
if (font->attachments && font->attachmentcount)
{
+ for (i = 0; i < (int)font->attachmentcount; ++i) {
+ if (font->attachments[i].data)
+ Mem_Free(font->attachments[i].data);
+ }
Mem_Free(font->attachments);
font->attachmentcount = 0;
font->attachments = NULL;
font->face = NULL;
}
}
+ if (font->data) {
+ Mem_Free(font->data);
+ font->data = NULL;
+ }
}
static float Font_SearchSize(ft2_font_t *font, FT_Face fontface, float size)
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);
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);
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])
{
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;
{
//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;
}
}
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)
{
//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;
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);
projects / xonotic / darkplaces.git / blobdiff