freetype: "loadfont" now uses virtual pixels, not real pixels, for font sizes, to...

[xonotic/darkplaces.git] / ft2.c

diff --git a/ft2.c b/ft2.c
index e27f95b6cc23122bff8038a88421b298485d6e58..df1daa38e7b47761b12703169c534932274d83c0 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -169,9 +169,7 @@ qboolean Font_OpenLibrary (void)
 {
        const char* dllnames [] =
        {
-#if defined(WIN64)
-               "freetype6_x64.dll",
-#elif defined(WIN32)
+#if defined(WIN32)
                "freetype6.dll",
 #elif defined(MACOSX)
                "libfreetype.dylib",
@@ -290,6 +288,22 @@ qboolean Font_Attach(ft2_font_t *font, ft2_attachment_t *attachment)
        return true;
 }
 
+static float Font_VirtualToRealSize(float sz)
+{
+       int vh, vw, si;
+       float sn;
+       if(sz < 0)
+               return sz;
+       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;
+       si = (int)sn;
+       if ( sn - (float)si >= 0.5 )
+               ++si;
+       return si;
+}
+
 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)
@@ -349,7 +363,7 @@ qboolean Font_LoadFont(const char *name, dp_font_t *dpfnt)
                count = 0;
                for (s = 0; s < MAX_FONT_SIZES; ++s)
                {
-                       if (Font_LoadSize(fb, dpfnt->req_sizes[s], true, false))
+                       if (Font_LoadSize(fb, Font_VirtualToRealSize(dpfnt->req_sizes[s]), true, false))
                                ++count;
                }
                if (!count)
@@ -376,7 +390,7 @@ qboolean Font_LoadFont(const char *name, dp_font_t *dpfnt)
        count = 0;
        for (s = 0; s < MAX_FONT_SIZES; ++s)
        {
-               if (Font_LoadSize(ft2, dpfnt->req_sizes[s], false, false))
+               if (Font_LoadSize(ft2, Font_VirtualToRealSize(dpfnt->req_sizes[s]), false, false))
                        ++count;
        }
        if (!count)