diff --git a/build_linux64/libamsfontconverter4.linux64.a b/build_linux64/libamsfontconverter4.linux64.a index 31f0928..85d67be 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 761bbc1..c9d5f86 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 e8b1701..a85b6fb 100644 Binary files a/build_linux64/tests and b/build_linux64/tests differ diff --git a/include/amsfontconverter4/amsfontconverter4_tests.hpp b/include/amsfontconverter4/amsfontconverter4_tests.hpp index 3fd2a11..a32c1a2 100644 --- a/include/amsfontconverter4/amsfontconverter4_tests.hpp +++ b/include/amsfontconverter4/amsfontconverter4_tests.hpp @@ -17,6 +17,7 @@ void test_getglyph2(); void test_facemetrics(); void test_glyphrange_load(); void test_load_fontfamily1(); +void test_rendertext_simple1(); }; }; diff --git a/notes/amstestfont.amsfont b/notes/amstestfont.amsfont index a54e455..e28649a 100644 Binary files a/notes/amstestfont.amsfont and b/notes/amstestfont.amsfont differ diff --git a/src/amsfontconverter4/amsfontconverter4_tests1.cpp b/src/amsfontconverter4/amsfontconverter4_tests1.cpp index 6cef1d0..121dbf4 100644 --- a/src/amsfontconverter4/amsfontconverter4_tests1.cpp +++ b/src/amsfontconverter4/amsfontconverter4_tests1.cpp @@ -168,10 +168,9 @@ void test_load_fontfamily1() gr.typefacetype = typefacetype_normal; amsff.addrange(gr); + + amsff.docalculations(); - - - amsff.print(); printf("Nglyphs: %ld\n",amsff.countglyphs()); @@ -194,5 +193,42 @@ void test_load_fontfamily1() return; } +void test_fontatlas2() +{ + ams::font4::amsfontatlas fa; + + return; +} + +void test_rendertext_simple1() +{ + int I; + amsstring s = "Hello World.\n This is a newline."; + amsfontatlas fa; + rendertext_simple_pars rpars; + rendertext_simple_mesh mesh; + + fa.load("../notes/amstestfont.amsfont"); + printf("debug: fa.Nglyphs: %d, range length %d\n",fa.Nglyphs,(int) fa.range.length); + + // for(I=0;I