sforman
/
Thun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try changing the font size.

This commit is contained in:
Simon Forman 2023-02-26 12:42:39 -08:00
parent f403b6caa2
commit 057743c473
4 changed files with 3038 additions and 6852 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
implementations/uvm-ncc/font/GNUmakefile
View File

@ -1,6 +1,6 @@
FONT=Inconsolata
POINTSIZE=24
POINTSIZE=14
FILL=white
TXTS=00.txt 01.txt 02.txt 03.txt 04.txt 05.txt 06.txt 07.txt 08.txt 09.txt 10.txt 11.txt 12.txt 13.txt 14.txt 15.txt 16.txt 17.txt 18.txt 19.txt 20.txt 21.txt 22.txt 23.txt 24.txt 25.txt 26.txt 27.txt 28.txt 29.txt 30.txt 31.txt 32.txt 33.txt 34.txt 35.txt 36.txt 37.txt 38.txt 39.txt 40.txt 41.txt 42.txt 43.txt 44.txt 45.txt 46.txt 47.txt 48.txt 49.txt 50.txt 51.txt 52.txt 53.txt 54.txt 55.txt 56.txt 57.txt 58.txt 59.txt 60.txt 61.txt 62.txt 63.txt 64.txt 65.txt 66.txt 67.txt 68.txt 69.txt 70.txt 71.txt 72.txt 73.txt 74.txt 75.txt 76.txt 77.txt 78.txt 79.txt 80.txt 81.txt 82.txt 83.txt 84.txt 85.txt 86.txt 87.txt 88.txt 89.txt 90.txt 91.txt 92.txt 93.txt
@ -19,10 +19,10 @@ all: font.h
$@
font.h: $(BMPS) convert.py
python ./convert.py > font.h
font.h: $(BMPS) convert.py GNUmakefile
python ./convert.py $(FONT) $(POINTSIZE) > font.h
$(TXTS): make_txt_files.py
$(TXTS): make_txt_files.py GNUmakefile
python ./make_txt_files.py
clean:

15
implementations/uvm-ncc/font/convert.py
View File

@ -1,3 +1,4 @@
import sys
from PIL import Image
txt = (
@ -7,6 +8,9 @@ txt = (
r'/\<>[]{}(),.;:!?'
)
font_name, pointsize = sys.argv[-2:] if len(sys.argv) >= 3 else ('Inconsolata', '24')
g = ((i, ch) for i, ch in enumerate(txt))
w, h = Image.open('00.bmp').size
@ -18,15 +22,16 @@ for i, _ in enumerate(txt):
print(f'''\
int font_width = {w};
int font_height = {h};
int font_{font_name}_{pointsize}_width = {w};
int font_{font_name}_{pointsize}_height = {h};
u32 font_{font_name}_{pointsize}_data[{len(txt)}][{w * h}];
u32 font_data[{len(txt)}][{w * h}];
void
init_font_data()
{{
\tmemset(font_data, 0, {4 * len(txt) * w * h});
\tmemset(font_{font_name}_{pointsize}_data, 0, {4 * len(txt) * w * h});
''')
for i, ch in enumerate(txt):
@ -35,7 +40,7 @@ for i, ch in enumerate(txt):
data = list(im.getdata())
for n, (blue, green, red, alpha) in enumerate(data):
if blue or green or red or alpha:
print(f'\tfont_data[{i}][{n}] = 0x{alpha:02x}_{red:02x}_{green:02x}_{blue:02x};')
print(f'\tfont_{font_name}_{pointsize}_data[{i}][{n}] = 0x{alpha:02x}_{red:02x}_{green:02x}_{blue:02x};')
print(f'}}')
##

9857
implementations/uvm-ncc/font/font.h
View File

File diff suppressed because it is too large Load Diff

10
implementations/uvm-ncc/xerblin.c
View File

@ -16,11 +16,11 @@ void
draw_char(u8 ch, u64 dest_x, u64 dest_y)
{
u32* dest = frame_buffer + FRAME_WIDTH * dest_y + dest_x;
u32* character_data = font_data[ch];
for (size_t x = 0; x < font_width; ++x) {
for (size_t y = 0; y < font_height; ++y) {
u32* character_data = font_Inconsolata_14_data[ch];
for (size_t x = 0; x < font_Inconsolata_14_width; ++x) {
for (size_t y = 0; y < font_Inconsolata_14_height; ++y) {
u32* pix_ptr = dest + x + FRAME_WIDTH * y;
u32 pixel = character_data[x + font_width * y];
u32 pixel = character_data[x + font_Inconsolata_14_width * y];
u8 alpha = pixel >> 24;
if (!alpha) { // no alpha
continue;
@ -83,7 +83,7 @@ main()
wid = window_create(FRAME_WIDTH, FRAME_HEIGHT, "Bouncing Ball Example", 0);
draw_background();
for (size_t ch = 0; ch < 94; ++ch) {
draw_char(ch, (ch % 26) * font_width, (ch / 26) * font_height);
draw_char(ch, (ch % 26) * font_Inconsolata_14_width, (ch / 26) * font_Inconsolata_14_height);
}
window_draw_frame(wid, frame_buffer);
//window_on_keydown(wid, keydown);