diff options
| author | Scott Shawcroft <scott@adafruit.com> | 2019-07-01 13:43:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 13:43:29 -0700 |
| commit | f76021ef823e76f581b4fc0b5d534cfda85aad9f (patch) | |
| tree | edbfb4b591d6f0fbca5b481721f35f829efec508 | |
| parent | f0a112ef5d04fc17a49ad8e2d74e5e23f3c40dd5 (diff) | |
| parent | 7c908b08ee3704a4784919e68b17e1a2f571fa17 (diff) | |
Merge pull request #1979 from pewpew-game/font-boundingbox
Use FONTBOUNDINGBOX for font metrics
| -rw-r--r-- | tools/gen_display_resources.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/gen_display_resources.py b/tools/gen_display_resources.py index 7b28c3105..2c674c8eb 100644 --- a/tools/gen_display_resources.py +++ b/tools/gen_display_resources.py @@ -29,7 +29,6 @@ class BitmapStub: self.rows[y] = bytes(row) f = bitmap_font.load_font(args.font, BitmapStub) -real_bb = [0, 0] # Load extra characters from the sample file. sample_characters = set() @@ -61,13 +60,11 @@ for c in all_characters: print("Font missing character:", c, ord(c)) filtered_characters = filtered_characters.replace(c, "") continue - x, y, dx, dy = g["bounds"] if g["shift"][1] != 0: raise RuntimeError("y shift") - real_bb[0] = max(real_bb[0], x - dx) - real_bb[1] = max(real_bb[1], y - dy) -tile_x, tile_y = real_bb +x, y, dx, dy = f.get_bounding_box() +tile_x, tile_y = x - dx, y - dy total_bits = tile_x * len(all_characters) total_bits += 32 - total_bits % 32 bytes_per_row = total_bits // 8 |