fiddlerwoaroof/crawl - Change ZGWMTQ4GG7W5HDVHPQCWJIUK4LK4PS3CDOOIQSFANTU33D45DCPAC

Adding better outlines to fonts so that they are more readable.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7131 c06c8d41-db1a-0410-9941-cceddc491573

Created by ennewalker on October 4, 2008

ZGWMTQ4GG7W5HDVHPQCWJIUK4LK4PS3CDOOIQSFANTU33D45DCPAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilesdl.h at line 127 [5.15441]

B:BD[4.206] → [4.206:254]

                  bool default_on_fail = true);

[4.206]

[5.18164]

                  bool default_on_fail, bool outline);

Insertion in crawl-ref/source/tilesdl.cc at line 136 [5.19415]
[5.22097]
[5.22097]
```
    // TODO enne - use a different icon on Windows, as this looks bad.
```

Replacement in crawl-ref/source/tilesdl.cc at line 178 [5.19415]

B:BD[4.610] → [4.610:668]

                             Options.tile_font_crt_size);

[4.610]

[4.668]

                             Options.tile_font_crt_size, true, false);

Replacement in crawl-ref/source/tilesdl.cc at line 180 [5.19415]

B:BD[4.733] → [4.733:791]

                             Options.tile_font_msg_size);

[4.733]

[4.791]

                             Options.tile_font_msg_size, true, false);

Replacement in crawl-ref/source/tilesdl.cc at line 182 [5.19415]

B:BD[4.858] → [4.858:918]

                              Options.tile_font_stat_size);

[4.858]

[4.918]

                              Options.tile_font_stat_size, true, false);

Replacement in crawl-ref/source/tilesdl.cc at line 184 [5.19415]

B:BD[4.981] → [4.981:1037]

                           Options.tile_font_tip_size);

[4.981]

[4.1037]

                           Options.tile_font_tip_size, true, false);

Replacement in crawl-ref/source/tilesdl.cc at line 186 [5.19415]

B:BD[4.1102] → [4.1102:1160]

                             Options.tile_font_lbl_size);

[4.1102]

[4.1160]

                             Options.tile_font_lbl_size, true, true);

Replacement in crawl-ref/source/tilesdl.cc at line 225 [5.19415]

B:BD[4.1683] → [4.1683:1735]

                              bool default_on_fail)

[4.1683]

[5.24448]

                              bool default_on_fail, bool outline)

Replacement in crawl-ref/source/tilesdl.cc at line 236 [5.19415]
∅:D[2.621] → [4.1962:2010]
B:BD[5.24482] → [4.1962:2010]
```
    if (!font->load_font(font_file, font_size))
```
[2.621]
[5.24532]
```
    if (!font->load_font(font_file, font_size, outline))
```

Replacement in crawl-ref/source/tilesdl.cc at line 240 [5.19415]

B:BD[4.2061] → [4.2061:2120]

            return (load_font("VeraMono.ttf", 12, false));

[4.2061]

[4.2120]

            return (load_font("VeraMono.ttf", 12, false, outline));

Replacement in crawl-ref/source/tilereg.cc at line 769 [5.54399]

B:BD[5.80239] → [5.80239:80309]

                                      min_pos, max_pos, WHITE, true);

[5.80239]

[5.80309]

                                      min_pos, max_pos, WHITE, false);

Replacement in crawl-ref/source/tilereg.cc at line 1197 [5.54399]

∅:D[3.418] → [6.1800:1912]

B:BD[6.1800] → [6.1800:1912]

                                  min_pos, max_pos, WHITE, true,
                                  200, BLACK);

[3.418]

[6.1912]

                                  min_pos, max_pos, WHITE, false, 200);

Replacement in crawl-ref/source/tilefont.h at line 20 [5.130638]
B:BD[5.131067] → [5.131067:131070]
```
//
```
[5.131067]
[5.131070]
```
// * using SDL_font (maybe?)
```

Replacement in crawl-ref/source/tilefont.h at line 31 [5.130638]

B:BD[5.131301] → [5.131301:131368]

    bool load_font(const char *font_name, unsigned int font_size);

[5.131301]

[5.131368]

    bool load_font(const char *font_name, unsigned int font_size, bool outline);

Replacement in crawl-ref/source/tilefont.cc at line 50 [5.132627]

B:BD[5.133643] → [5.133643:133713]

bool FTFont::load_font(const char *font_name, unsigned int font_size)

[5.133643]

[5.133713]

bool FTFont::load_font(const char *font_name, unsigned int font_size, bool outl)

Replacement in crawl-ref/source/tilefont.cc at line 116 [5.132627]

B:BD[5.135093] → [4.3305:3358]

∅:D[4.3358] → [5.135093:135243]

B:BD[5.135093] → [5.135093:135243]

        max_width = std::max(max_width, bmp->width);
        min_y = std::min(min_y, ascender - face->glyph->bitmap_top);
        max_y = std::max(max_y, ascender + bmp->rows - face->glyph->bitmap_top);

[5.135093]

[5.135243]

        int bmp_width = bmp->width;
        int bmp_top = ascender - face->glyph->bitmap_top;
        int bmp_bottom = ascender + bmp->rows - face->glyph->bitmap_top;
        if (outl)
        {
            bmp_width += 2;
            bmp_top -= 1;
            bmp_bottom += 1;
        }
        max_width = std::max(max_width, bmp_width);
        min_y = std::min(min_y, bmp_top);
        max_y = std::max(max_y, bmp_bottom);

Replacement in crawl-ref/source/tilefont.cc at line 132 [5.132627]
B:BD[5.135338] → [4.3359:3399]
```
        m_glyphs[c].width = bmp->width;
```
[5.135338]
[5.135338]
```
        m_glyphs[c].width = bmp_width;
```

Replacement in crawl-ref/source/tilefont.cc at line 206 [5.132627]

B:BD[5.137664] → [5.137664:138096]

B:BD[5.138096] → [2.3096:3110]

        for (int x = 0; x < bmp->width; x++)
            for (int y = 0; y < bmp->rows; y++)
            {
                unsigned int idx = offset_x + x + (offset_y + y) * width;
                idx *= 4;
                unsigned char alpha = bmp->buffer[x + bmp->width * y];
                pixels[idx] = 255;
                pixels[idx + 1] = 255;
                pixels[idx + 2] = 255;
                pixels[idx + 3] = alpha;
            }

[5.137664]

[5.138114]

        if (outl)
        {
            const int charw = bmp->width;
            for (int x = -1; x <= bmp->width; x++)
                for (int y = -1; y <= bmp->rows; y++)
                {
                    bool valid = x >= 0 && y >= 0 &&
                                 x < bmp->width && y < bmp->rows;
                    unsigned char orig = valid ? bmp->buffer[x + charw * y] : 0;
                    unsigned char edge = 0;
                    if (x > 0)
                        edge = std::max(bmp->buffer[(x-1) + charw * y], edge);
                    if (y > 0)
                        edge = std::max(bmp->buffer[x + charw * (y-1)], edge);
                    if (x < bmp->width - 1)
                        edge = std::max(bmp->buffer[(x+1) + charw * y], edge);
                    if (y < bmp->width - 1)
                        edge = std::max(bmp->buffer[x + charw * (y+1)], edge);
                    unsigned int idx = offset_x + x + (offset_y + y) * width;
                    idx *= 4;
                    pixels[idx] = orig;
                    pixels[idx + 1] = orig;
                    pixels[idx + 2] = orig;
                    pixels[idx + 3] = std::min(orig + edge, 255);
                }
        }
        else
        {
            for (int x = 0; x < bmp->width; x++)
                for (int y = 0; y < bmp->rows; y++)
                {
                    unsigned int idx = offset_x + x + (offset_y + y) * width;
                    idx *= 4;
                    unsigned char alpha = bmp->buffer[x + bmp->width * y];
                    pixels[idx] = 255;
                    pixels[idx + 1] = 255;
                    pixels[idx + 2] = 255;
                    pixels[idx + 3] = alpha;
                }
        }