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"};
/*
================================================================================
{
#if defined(WIN32)
"freetype6.dll",
+ "libfreetype-6.dll",
#elif defined(MACOSX)
+ "libfreetype.6.dylib",
"libfreetype.dylib",
#else
"libfreetype.so.6",
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();
}
/*
return true;
}
-static float Font_VirtualToRealSize(float sz)
+float Font_VirtualToRealSize(float sz)
{
int vh, vw, si;
float sn;
return si;
}
+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_LoadSize(ft2_font_t *font, float size, qboolean no_texture, qboolean no_kerning);
qboolean Font_LoadFont(const char *name, dp_font_t *dpfnt)
break;
}
count = 0;
- for (s = 0; s < MAX_FONT_SIZES; ++s)
+ for (s = 0; s < MAX_FONT_SIZES && dpfnt->req_sizes[s] >= 0; ++s)
{
if (Font_LoadSize(fb, Font_VirtualToRealSize(dpfnt->req_sizes[s]), true, false))
++count;
}
count = 0;
- for (s = 0; s < MAX_FONT_SIZES; ++s)
+ for (s = 0; s < MAX_FONT_SIZES && dpfnt->req_sizes[s] >= 0; ++s)
{
if (Font_LoadSize(ft2, Font_VirtualToRealSize(dpfnt->req_sizes[s]), false, false))
++count;
}
else
{
- fmap->kerning.kerning[l][r][0] = (kernvec.x >> 6) / fmap->size;
- fmap->kerning.kerning[l][r][1] = (kernvec.y >> 6) / fmap->size;
+ fmap->kerning.kerning[l][r][0] = Font_SnapTo((kernvec.x / 64.0) / fmap->size, 1 / fmap->size);
+ fmap->kerning.kerning[l][r][1] = Font_SnapTo((kernvec.y / 64.0) / fmap->size, 1 / fmap->size);
}
}
}
int nval;
int matchsize = -10000;
int m;
- int size;
- float fsize;
+ float fsize_x, fsize_y;
ft2_font_map_t **maps = font->font_maps;
- fsize = _fsize * vid.height / vid_conheight.value;
+ fsize_x = fsize_y = _fsize * vid.height / vid_conheight.value;
+ if(outw && *outw)
+ fsize_x = *outw * vid.width / vid_conwidth.value;
+ if(outh && *outh)
+ fsize_y = *outh * vid.height / vid_conheight.value;
- if (fsize < 0)
- size = 16;
+ if (fsize_x < 0)
+ {
+ if(fsize_y < 0)
+ fsize_x = fsize_y = 16;
+ else
+ fsize_x = fsize_y;
+ }
else
{
- // round up
- size = (int)fsize;
- if (fsize - (float)size >= 0.49)
- ++size;
+ if(fsize_y < 0)
+ fsize_y = fsize_x;
}
for (m = 0; m < MAX_FONT_SIZES; ++m)
if (!maps[m])
continue;
// "round up" to the bigger size if two equally-valued matches exist
- nval = abs(maps[m]->size - size);
+ nval = 0.5 * (abs(maps[m]->size - fsize_x) + abs(maps[m]->size - fsize_y));
if (match == -1 || nval < value || (nval == value && matchsize < maps[m]->size))
{
value = nval;
}
if (value <= r_font_size_snapping.value)
{
- if (outw && outh)
- {
- if (!*outh) *outh = *outw;
- if (!*outw) *outw = *outh;
- }
- // keep the aspect
+ // do NOT keep the aspect for perfect rendering
if (outh) *outh = maps[match]->size * vid_conheight.value / vid.height;
- if (outw) *outw = maps[match]->size * vid_conwidth.value / vid.width * *outw / _fsize;
+ if (outw) *outw = maps[match]->size * vid_conwidth.value / vid.width;
}
return match;
}
qboolean Font_GetKerningForMap(ft2_font_t *font, int map_index, float w, float h, Uchar left, Uchar right, float *outx, float *outy)
{
ft2_font_map_t *fmap;
- if (!font->has_kerning)
+ if (!font->has_kerning || !r_font_kerning.integer)
return false;
if (map_index < 0 || map_index >= MAX_FONT_SIZES)
return false;
return false;
if (left < 256 && right < 256)
{
+ //Con_Printf("%g : %f, %f, %f :: %f\n", (w / (float)fmap->size), w, fmap->size, fmap->intSize, Font_VirtualToRealSize(w));
// quick-kerning, be aware of the size: scale it
- if (outx) *outx = fmap->kerning.kerning[left][right][0] * w / (float)fmap->size;
- if (outy) *outy = fmap->kerning.kerning[left][right][1] * h / (float)fmap->size;
+ if (outx) *outx = fmap->kerning.kerning[left][right][0];// * (w / (float)fmap->size);
+ if (outy) *outy = fmap->kerning.kerning[left][right][1];// * (h / (float)fmap->size);
return true;
}
else
FT_ULong ul, ur;
//if (qFT_Set_Pixel_Sizes((FT_Face)font->face, 0, fmap->size))
+#if 0
if (!Font_SetSize(font, w, h))
{
// this deserves an error message
ur = qFT_Get_Char_Index(font->face, right);
if (qFT_Get_Kerning(font->face, ul, ur, FT_KERNING_DEFAULT, &kernvec))
{
- if (outx) *outx = kernvec.x * fmap->sfx;
- if (outy) *outy = kernvec.y * fmap->sfy;
+ if (outx) *outx = Font_SnapTo(kernvec.x * fmap->sfx, 1 / fmap->size);
+ if (outy) *outy = Font_SnapTo(kernvec.y * fmap->sfy, 1 / fmap->size);
+ return true;
+ }
+#endif
+ if (!Font_SetSize(font, fmap->intSize, fmap->intSize))
+ {
+ // this deserves an error message
+ 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))
+ {
+ 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);
return true;
}
return false;
Mem_Free(map);
return false;
}
+ memset(map->width_of, 0, sizeof(map->width_of));
// initialize as white texture with zero alpha
tp = 0;
mapch = ch - map->start;
- if (developer_extra.integer)
+ if (developer_font.integer)
Con_DPrint("glyphinfo: ------------- GLYPH INFO -----------------\n");
++gC;
switch (bmp->pixel_mode)
{
case FT_PIXEL_MODE_MONO:
- if (developer_extra.integer)
+ if (developer_font.integer)
Con_DPrint("glyphinfo: Pixel Mode: MONO\n");
break;
case FT_PIXEL_MODE_GRAY2:
- if (developer_extra.integer)
+ if (developer_font.integer)
Con_DPrint("glyphinfo: Pixel Mode: GRAY2\n");
break;
case FT_PIXEL_MODE_GRAY4:
- if (developer_extra.integer)
+ if (developer_font.integer)
Con_DPrint("glyphinfo: Pixel Mode: GRAY4\n");
break;
case FT_PIXEL_MODE_GRAY:
- if (developer_extra.integer)
+ if (developer_font.integer)
Con_DPrint("glyphinfo: Pixel Mode: GRAY\n");
break;
default:
- if (developer_extra.integer)
+ if (developer_font.integer)
Con_DPrintf("glyphinfo: Pixel Mode: Unknown: %i\n", bmp->pixel_mode);
Mem_Free(data);
Con_Printf("ERROR: Unrecognized pixel mode for font %s size %f: %i\n", font->name, mapstart->size, bmp->pixel_mode);
// old way
// double advance = (double)glyph->metrics.horiAdvance * map->sfx;
- double bearingX = (glyph->metrics.horiBearingX >> 6) / map->size;
- double bearingY = (glyph->metrics.horiBearingY >> 6) / map->size;
- double advance = (glyph->advance.x >> 6) / map->size;
- double mWidth = (glyph->metrics.width >> 6) / map->size;
- double mHeight = (glyph->metrics.height >> 6) / map->size;
+ double bearingX = (glyph->metrics.horiBearingX / 64.0) / map->size;
+ //double bearingY = (glyph->metrics.horiBearingY >> 6) / map->size;
+ double advance = (glyph->advance.x / 64.0) / map->size;
+ //double mWidth = (glyph->metrics.width >> 6) / map->size;
+ //double mHeight = (glyph->metrics.height >> 6) / map->size;
- mapglyph->vxmin = bearingX;
- mapglyph->vxmax = bearingX + mWidth;
- mapglyph->vymin = -bearingY;
- mapglyph->vymax = mHeight - bearingY;
mapglyph->txmin = ( (double)(gC * map->glyphSize) ) / ( (double)(map->glyphSize * FONT_CHARS_PER_LINE) );
mapglyph->txmax = mapglyph->txmin + (double)bmp->width / ( (double)(map->glyphSize * FONT_CHARS_PER_LINE) );
mapglyph->tymin = ( (double)(gR * map->glyphSize) ) / ( (double)(map->glyphSize * FONT_CHAR_LINES) );
mapglyph->tymax = mapglyph->tymin + (double)bmp->rows / ( (double)(map->glyphSize * FONT_CHAR_LINES) );
- //Con_Printf("dpi = %f %f (%f %d)\n", (mapglyph->vxmax - mapglyph->vxmin) / (mapglyph->txmax - mapglyph->txmin), (mapglyph->vymax - mapglyph->vymin) / (mapglyph->tymax - mapglyph->tymin), map->size, map->glyphSize);
+ //mapglyph->vxmin = bearingX;
+ //mapglyph->vxmax = bearingX + mWidth;
+ mapglyph->vxmin = glyph->bitmap_left / map->size;
+ mapglyph->vxmax = mapglyph->vxmin + bmp->width / map->size; // don't ask
+ //mapglyph->vymin = -bearingY;
+ //mapglyph->vymax = mHeight - bearingY;
+ mapglyph->vymin = -glyph->bitmap_top / map->size;
+ mapglyph->vymax = mapglyph->vymin + bmp->rows / 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;
- mapglyph->advance_x = advance;
+ //mapglyph->advance_x = advance;
+ mapglyph->advance_x = Font_SnapTo(advance, 1 / map->size);
mapglyph->advance_y = 0;
- if (developer_extra.integer)
+ if (developer_font.integer)
{
Con_DPrintf("glyphinfo: Glyph: %lu at (%i, %i)\n", (unsigned long)ch, gC, gR);
Con_DPrintf("glyphinfo: %f, %f, %lu\n", bearingX, map->sfx, (unsigned long)glyph->metrics.horiBearingX);
// create a texture from the data now
- if (developer_extra.integer)
+ if (developer_font.integer > 100)
{
// LordHavoc: why are we writing this? And why not write it as TGA using the appropriate function?
// view using `display -depth 8 -size 512x512 name_page.rgba` (be sure to use a correct -size parameter)
projects / xonotic / darkplaces.git / blobdiff