diff --git a/build_linux64/libamsfontconverter4.linux64.a b/build_linux64/libamsfontconverter4.linux64.a index cbf33e0..c0a080f 100644 Binary files a/build_linux64/libamsfontconverter4.linux64.a and b/build_linux64/libamsfontconverter4.linux64.a differ diff --git a/build_linux64/objstore/amsfontconverter4_tests1.o b/build_linux64/objstore/amsfontconverter4_tests1.o index 90fd469..1ab6cda 100644 Binary files a/build_linux64/objstore/amsfontconverter4_tests1.o and b/build_linux64/objstore/amsfontconverter4_tests1.o differ diff --git a/build_linux64/tests b/build_linux64/tests index cecb002..2a77b5b 100644 Binary files a/build_linux64/tests and b/build_linux64/tests differ diff --git a/notes/amstestfont.amsfont b/notes/amstestfont.amsfont new file mode 100644 index 0000000..c794eba Binary files /dev/null and b/notes/amstestfont.amsfont differ diff --git a/notes/testfontatlastexture.png b/notes/testfontatlastexture.png new file mode 100644 index 0000000..0d5cbac Binary files /dev/null and b/notes/testfontatlastexture.png differ diff --git a/src/amsfontconverter4/amsfontconverter4_tests1.cpp b/src/amsfontconverter4/amsfontconverter4_tests1.cpp index dbe3672..d558065 100644 --- a/src/amsfontconverter4/amsfontconverter4_tests1.cpp +++ b/src/amsfontconverter4/amsfontconverter4_tests1.cpp @@ -131,12 +131,19 @@ void test_load_fontfamily1() int charheight = 30; amsglyphrange gr; amsfontfamily amsff; + amsfontatlas fa; - const char *nfont = "../inputfonts/FreeMono.ttf"; - const char *bfont = "../inputfonts/FreeMonoBold.ttf"; - const char *ifont = "../inputfonts/FreeMonoOblique.ttf"; - const char *bifont = "../inputfonts/FreeMonoBoldOblique.ttf"; + // const char *nfont = "../inputfonts/FreeMono.ttf"; + // const char *bfont = "../inputfonts/FreeMonoBold.ttf"; + // const char *ifont = "../inputfonts/FreeMonoOblique.ttf"; + // const char *bifont = "../inputfonts/FreeMonoBoldOblique.ttf"; + const char *nfont = "../inputfonts/LiberationSans-Regular.ttf"; + const char *bfont = "../inputfonts/LiberationSans-Bold.ttf"; + const char *ifont = "../inputfonts/LiberationSans-Italic.ttf"; + const char *bifont = "../inputfonts/LiberationSans-BoldItalic.ttf"; + + amsff.charheight = charheight; res = ft_load_glyphrange(nfont,charheight,0,256,&gr); gr.typefacetype = typefacetype_normal; amsff.addrange(gr); @@ -163,11 +170,17 @@ void test_load_fontfamily1() amsff.docalculations(); - - - - + amsff.print(); + printf("Nglyphs: %ld\n",amsff.countglyphs()); + + amsff.build_fontatlas(&fa); + fa.print(); + + fa.savetexture("../notes/testfontatlastexture.png"); + + fa.save("../notes/amstestfont.amsfont"); + fa.load("../notes/amstestfont.amsfont"); return;