add a menu/csqc field .drawfontscale to scale the font drawn by drawfont but not...

[xonotic/darkplaces.git] / gl_draw.c

diff --git a/gl_draw.c b/gl_draw.c
index 1f9aa358bf02dc0e9d505044b6e316d3a9c4c3b6..1f749284e3f4fdb04c1bc0cfbdd4a9465f328dac 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -1074,7 +1074,7 @@ static void DrawQ_GetTextColor(float color[4], int colorindex, float r, float g,
 }
 
 // NOTE: this function always draws exactly one character if maxwidth <= 0
-float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w, float h, size_t *maxlen, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxwidth)
+float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size_Scale(const char *text, float w, float h, float sw, float sh, size_t *maxlen, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxwidth)
 {
        const char *text_start = text;
        int colorindex = STRING_COLOR_DEFAULT;
@@ -1093,6 +1093,7 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
        // float ftbase_x;
        qboolean snap = true;
        qboolean least_one = false;
+       float dw, dh; // display w/h
 
        if (!h) h = w;
        if (!h) {
@@ -1112,6 +1113,16 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
                        map_index = Font_IndexForSize(ft2, h, NULL, NULL);
                fontmap = Font_MapForIndex(ft2, map_index);
        }
+       if(snap)
+       {
+               if(fabs(sw - 1) > 0.001 || fabs(sh - 1) > 0.001)
+                       snap = false; // turn off pixel snapping for better animation
+               else
+                       sw = sh = 1;
+       }
+
+       dw = w * sw;
+       dh = h * sh;
 
        if (*maxlen < 1)
                *maxlen = 1<<30;
@@ -1142,12 +1153,12 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
                if (ch == ' ' && !fontmap)
                {
                        if(!least_one || i0) // never skip the first character
-                       if(x + fnt->width_of[(int) ' '] * w > maxwidth)
+                       if(x + fnt->width_of[(int) ' '] * dw > maxwidth)
                        {
                                i = i0;
                                break; // oops, can't draw this
                        }
-                       x += fnt->width_of[(int) ' '] * w;
+                       x += fnt->width_of[(int) ' '] * dw;
                        continue;
                }
                // i points to the char after ^
@@ -1214,12 +1225,12 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
                                map = ft2_oldstyle_map;
                        prevch = 0;
                        if(!least_one || i0) // never skip the first character
-                       if(x + fnt->width_of[ch] * w > maxwidth)
+                       if(x + fnt->width_of[ch] * dw > maxwidth)
                        {
                                i = i0;
                                break; // oops, can't draw this
                        }
-                       x += fnt->width_of[ch] * w;
+                       x += fnt->width_of[ch] * dw;
                } else {
                        if (!map || map == ft2_oldstyle_map || map->start < ch || map->start + FONT_CHARS_PER_MAP >= ch)
                        {
@@ -1234,8 +1245,8 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
                        }
                        mapch = ch - map->start;
                        if (prevch && Font_GetKerningForMap(ft2, map_index, w, h, prevch, ch, &kx, NULL))
-                               x += kx * w;
-                       x += map->glyphs[mapch].advance_x * w;
+                               x += kx * dw;
+                       x += map->glyphs[mapch].advance_x * dw;
                        prevmap = map;
                        prevch = ch;
                }
@@ -1249,7 +1260,7 @@ float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w
        return x;
 }
 
-float DrawQ_String_Font(float startx, float starty, const char *text, size_t maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt)
+float DrawQ_String_Font_Scale(float startx, float starty, const char *text, size_t maxlen, float w, float h, float sw, float sh, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt)
 {
        int shadow, colorindex = STRING_COLOR_DEFAULT;
        size_t i;
@@ -1274,6 +1285,7 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
        qboolean snap = true;
        float pix_x, pix_y;
        size_t bytes_left;
+       float dw, dh;
 
        int tw, th;
        tw = R_TextureWidth(fnt->tex);
@@ -1297,10 +1309,20 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
                        map_index = Font_IndexForSize(ft2, h, NULL, NULL);
                fontmap = Font_MapForIndex(ft2, map_index);
        }
+       if(snap)
+       {
+               if(fabs(sw - 1) > 0.001 || fabs(sh - 1) > 0.001)
+                       snap = false; // turn off pixel snapping for better animation
+               else
+                       sw = sh = 1;
+       }
+
+       dw = w * sw;
+       dh = h * sh;
 
        // draw the font at its baseline when using freetype
        //ftbase_x = 0;
-       ftbase_y = h * (4.5/6.0);
+       ftbase_y = dh * (4.5/6.0);
 
        if (maxlen < 1)
                maxlen = 1<<30;
@@ -1321,7 +1343,8 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
        batchcount = 0;
 
        //ftbase_x = snap_to_pixel_x(ftbase_x);
-       ftbase_y = snap_to_pixel_y(ftbase_y, 0.3);
+       if(snap)
+               ftbase_y = snap_to_pixel_y(ftbase_y, 0.3);
 
        pix_x = vid.width / vid_conwidth.value;
        pix_y = vid.height / vid_conheight.value;
@@ -1358,7 +1381,7 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
                        }
                        if (ch == ' ' && !fontmap)
                        {
-                               x += fnt->width_of[(int) ' '] * w;
+                               x += fnt->width_of[(int) ' '] * dw;
                                continue;
                        }
                        if (ch == STRING_COLOR_TAG && !ignorecolorcodes && i < maxlen)
@@ -1465,9 +1488,9 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
                                at[ 4] = s+u    ; at[ 5] = t+v  ;
                                at[ 6] = s              ; at[ 7] = t+v  ;
                                av[ 0] = x                      ; av[ 1] = y    ; av[ 2] = 10;
-                               av[ 3] = x+w*thisw      ; av[ 4] = y    ; av[ 5] = 10;
-                               av[ 6] = x+w*thisw      ; av[ 7] = y+h  ; av[ 8] = 10;
-                               av[ 9] = x                      ; av[10] = y+h  ; av[11] = 10;
+                               av[ 3] = x+dw*thisw     ; av[ 4] = y    ; av[ 5] = 10;
+                               av[ 6] = x+dw*thisw     ; av[ 7] = y+dh ; av[ 8] = 10;
+                               av[ 9] = x                      ; av[10] = y+dh ; av[11] = 10;
                                ac += 16;
                                at += 8;
                                av += 12;
@@ -1482,7 +1505,7 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
                                        at = texcoord2f;
                                        av = vertex3f;
                                }
-                               x += thisw * w;
+                               x += thisw * dw;
                        } else {
                                if (!map || map == ft2_oldstyle_map || map->start < ch || map->start + FONT_CHARS_PER_MAP >= ch)
                                {
@@ -1524,8 +1547,8 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
                                y += ftbase_y;
                                if (prevch && Font_GetKerningForMap(ft2, map_index, w, h, prevch, ch, &kx, &ky))
                                {
-                                       x += kx * w;
-                                       y += ky * h;
+                                       x += kx * dw;
+                                       y += ky * dh;
                                }
                                else
                                        kx = ky = 0;
@@ -1537,14 +1560,14 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
                                at[2] = map->glyphs[mapch].txmax; at[3] = map->glyphs[mapch].tymin;
                                at[4] = map->glyphs[mapch].txmax; at[5] = map->glyphs[mapch].tymax;
                                at[6] = map->glyphs[mapch].txmin; at[7] = map->glyphs[mapch].tymax;
-                               av[ 0] = x + w * map->glyphs[mapch].vxmin; av[ 1] = y + h * map->glyphs[mapch].vymin; av[ 2] = 10;
-                               av[ 3] = x + w * map->glyphs[mapch].vxmax; av[ 4] = y + h * map->glyphs[mapch].vymin; av[ 5] = 10;
-                               av[ 6] = x + w * map->glyphs[mapch].vxmax; av[ 7] = y + h * map->glyphs[mapch].vymax; av[ 8] = 10;
-                               av[ 9] = x + w * map->glyphs[mapch].vxmin; av[10] = y + h * map->glyphs[mapch].vymax; av[11] = 10;
+                               av[ 0] = x + dw * map->glyphs[mapch].vxmin; av[ 1] = y + dh * map->glyphs[mapch].vymin; av[ 2] = 10;
+                               av[ 3] = x + dw * map->glyphs[mapch].vxmax; av[ 4] = y + dh * map->glyphs[mapch].vymin; av[ 5] = 10;
+                               av[ 6] = x + dw * map->glyphs[mapch].vxmax; av[ 7] = y + dh * map->glyphs[mapch].vymax; av[ 8] = 10;
+                               av[ 9] = x + dw * map->glyphs[mapch].vxmin; av[10] = y + dh * map->glyphs[mapch].vymax; av[11] = 10;
                                //x -= ftbase_x;
                                y -= ftbase_y;
 
-                               x += thisw * w;
+                               x += thisw * dw;
                                ac += 16;
                                at += 8;
                                av += 12;
@@ -1584,11 +1607,21 @@ float DrawQ_String_Font(float startx, float starty, const char *text, size_t max
        return x;
 }
 
+float DrawQ_String_Font(float startx, float starty, const char *text, size_t maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt)
+{
+       return DrawQ_String_Font_Scale(startx, starty, text, maxlen, w, h, 1, 1, basered, basegreen, baseblue, basealpha, flags, outcolor, ignorecolorcodes, fnt);
+}
+
 float DrawQ_String(float startx, float starty, const char *text, size_t maxlen, float w, float h, float basered, float basegreen, float baseblue, float basealpha, int flags, int *outcolor, qboolean ignorecolorcodes)
 {
        return DrawQ_String_Font(startx, starty, text, maxlen, w, h, basered, basegreen, baseblue, basealpha, flags, outcolor, ignorecolorcodes, &dp_fonts[0]);
 }
 
+float DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size(const char *text, float w, float h, size_t *maxlen, int *outcolor, qboolean ignorecolorcodes, const dp_font_t *fnt, float maxwidth)
+{
+       return DrawQ_TextWidth_Font_UntilWidth_TrackColors_Size_Scale(text, w, h, 1, 1, maxlen, outcolor, ignorecolorcodes, fnt, maxwidth);
+}
+
 float DrawQ_TextWidth_Font(const char *text, size_t maxlen, qboolean ignorecolorcodes, const dp_font_t *fnt)
 {
        return DrawQ_TextWidth_Font_UntilWidth(text, &maxlen, ignorecolorcodes, fnt, 1000000000);