X-Git-Url: https://harrygodden.com/git/?p=vg.git;a=blobdiff_plain;f=vg_build_font.h;fp=vg_build_font.h;h=5278ca10094b94cd84594641737ced96384b0e31;hp=5f0fd3b4e0759e04869c8b876c893bf9f838d87d;hb=cc5c184b1264d2e33398c1a4c03e75fb42ca04f5;hpb=70530f5055e116c22ab1b433884573944e9c4f64 diff --git a/vg_build_font.h b/vg_build_font.h index 5f0fd3b..5278ca1 100644 --- a/vg_build_font.h +++ b/vg_build_font.h @@ -6,10 +6,13 @@ void vg_build_font_face_run( vg_font_face *face, char first, char last, i16 x, i16 y ) { - u32 count = (u32)last - (u32)first; + u32 uf = *((u8 *)&first), + ul = *((u8 *)&last); + + u32 count = ul - uf; for( u32 i=0; i<=count; i ++ ) { - u32 index = (u32)first + i; + u32 index = uf + i; face->map[index].x = x+(i*face->cw); face->map[index].y = y; } @@ -107,6 +110,7 @@ void vg_build_default_font(void) vg_build_font_face_run( &small, 'A', 'Z', 0, 14 ); vg_build_font_face_run( &small, 'a', 'z', 0, 28 ); vg_build_font_face_run( &small, '0', '9', 208,14 ); + vg_build_font_face_run( &small, 0x7f, 0xa4, 0,42 ); vg_build_write_font_face( fp, &small ); vg_font_face large = @@ -123,13 +127,14 @@ void vg_build_default_font(void) vg_build_font_face_run( &large, 'A', 'Z', 0, 77 ); vg_build_font_face_run( &large, 'a', 'z', 0, 98 ); vg_build_font_face_run( &large, '0', '9', 312,77 ); + vg_build_font_face_run( &large, 0x7f, 0xa4, 0,119 ); vg_build_write_font_face( fp, &large ); vg_font_face title = { .name = "vgf_default_title", .cw=24, .ch=42, - .sx=24, .sy=42, + .sx=20, .sy=42, .baseline=12, }; vg_build_font_face_run( &title, '!', '/', 24, 140 ); @@ -142,6 +147,11 @@ void vg_build_default_font(void) vg_build_font_face_run( &title, 'a', 'u', 0, 266 ); vg_build_font_face_run( &title, 'v', 'z', 0, 350 ); vg_build_font_face_run( &title, '0', '9', 120,308 ); + vg_build_font_face_run( &title, 0x89, 0x8c, 409,182 ); + vg_build_font_face_run( &title, 0x8d, 0x92, 360,308 ); + vg_build_font_face_run( &title, 0x7f, 0x88, 120,350 ); + vg_build_font_face_run( &title, 0x93, 0x98, 360,350 ); + vg_build_font_face_run( &title, 0x99, 0xa4, 0,392 ); vg_build_write_font_face( fp, &title ); fclose( fp );