diff --git a/build_linux64/ams_testrendertextfile b/build_linux64/ams_testrendertextfile new file mode 100644 index 0000000..2dd94f5 Binary files /dev/null and b/build_linux64/ams_testrendertextfile differ diff --git a/build_linux64/amsdumpfontatlastexture b/build_linux64/amsdumpfontatlastexture new file mode 100644 index 0000000..0dc71be Binary files /dev/null and b/build_linux64/amsdumpfontatlastexture differ diff --git a/build_linux64/amsmakefontatlasv1 b/build_linux64/amsmakefontatlasv1 new file mode 100644 index 0000000..db882ab Binary files /dev/null and b/build_linux64/amsmakefontatlasv1 differ diff --git a/build_linux64/libamsfontconverter4.linux64.a b/build_linux64/libamsfontconverter4.linux64.a index efb3863..a5f374a 100644 Binary files a/build_linux64/libamsfontconverter4.linux64.a and b/build_linux64/libamsfontconverter4.linux64.a differ diff --git a/build_linux64/makefont1.sh b/build_linux64/makefont1.sh new file mode 100644 index 0000000..7c73584 --- /dev/null +++ b/build_linux64/makefont1.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +charheight=25 +normal=../inputfonts/FreeMono.ttf +bold=../inputfonts/FreeMonoBold.ttf +italic=../inputfonts/FreeMonoOblique.ttf +bolditalic=../inputfonts/FreeMonoBoldOblique.ttf +output=../outputfonts/amsmono25.amsfontatlas +outputimg=../outputfonts/amsmono25.png + +./amsmakefontatlasv1 $normal $bold $italic $bolditalic $charheight $output +./amsdumpfontatlastexture $output $outputimg + +charheight=25 +normal=../inputfonts/LiberationSans-Regular.ttf +bold=../inputfonts/LiberationSans-Bold.ttf +italic=../inputfonts/LiberationSans-Italic.ttf +bolditalic=../inputfonts/LiberationSans-BoldItalic.ttf +output=../outputfonts/amssans25.amsfontatlas +outputimg=../outputfonts/amssans25.png + +./amsmakefontatlasv1 $normal $bold $italic $bolditalic $charheight $output +./amsdumpfontatlastexture $output $outputimg + +charheight=25 +normal=../inputfonts/LiberationSerif-Regular.ttf +bold=../inputfonts/LiberationSerif-Bold.ttf +italic=../inputfonts/LiberationSerif-Italic.ttf +bolditalic=../inputfonts/LiberationSerif-BoldItalic.ttf +output=../outputfonts/amsserif25.amsfontatlas +outputimg=../outputfonts/amsserif25.png + +./amsmakefontatlasv1 $normal $bold $italic $bolditalic $charheight $output +./amsdumpfontatlastexture $output $outputimg \ No newline at end of file diff --git a/build_linux64/objstore/amsfontconverter4_convertfontatlas.o b/build_linux64/objstore/amsfontconverter4_convertfontatlas.o new file mode 100644 index 0000000..8b9cb03 Binary files /dev/null and b/build_linux64/objstore/amsfontconverter4_convertfontatlas.o differ diff --git a/build_linux64/renderafile.sh b/build_linux64/renderafile.sh new file mode 100644 index 0000000..b57c0bd --- /dev/null +++ b/build_linux64/renderafile.sh @@ -0,0 +1,7 @@ +#!/usr/bin/bash + +textfile=./makefont1.sh +fontfile=../outputfonts/amsserif25.amsfontatlas +outimg=../notes/testrender.png + +./ams_testrendertextfile $textfile $fontfile $outimg \ No newline at end of file diff --git a/build_linux64/tests b/build_linux64/tests index 4ed7e1b..2dd94f5 100644 Binary files a/build_linux64/tests and b/build_linux64/tests differ diff --git a/include/amsfontconverter4/amsfontconverter4.hpp b/include/amsfontconverter4/amsfontconverter4.hpp index 225e634..6f3f62b 100644 --- a/include/amsfontconverter4/amsfontconverter4.hpp +++ b/include/amsfontconverter4/amsfontconverter4.hpp @@ -64,6 +64,15 @@ namespace font4 ); + //converts truetype font files to a textureatlas page file + void convertfontatlas_v1(int argc, char* argv[]); + + //dumps fontatlas image + void dumpfontatlastexture(int argc, char* argv[]); + + //renders a text file as an image + void testrendertextfile(int argc, char* argv[]); + }; }; diff --git a/notes/testrender.png b/notes/testrender.png new file mode 100644 index 0000000..44aa435 Binary files /dev/null and b/notes/testrender.png differ diff --git a/outputfonts/amsmono25.amsfontatlas b/outputfonts/amsmono25.amsfontatlas new file mode 100644 index 0000000..2a6b802 Binary files /dev/null and b/outputfonts/amsmono25.amsfontatlas differ diff --git a/outputfonts/amsmono25.png b/outputfonts/amsmono25.png new file mode 100644 index 0000000..492efee Binary files /dev/null and b/outputfonts/amsmono25.png differ diff --git a/outputfonts/amssans25.amsfontatlas b/outputfonts/amssans25.amsfontatlas new file mode 100644 index 0000000..8d5fc4e Binary files /dev/null and b/outputfonts/amssans25.amsfontatlas differ diff --git a/outputfonts/amssans25.png b/outputfonts/amssans25.png new file mode 100644 index 0000000..c147409 Binary files /dev/null and b/outputfonts/amssans25.png differ diff --git a/outputfonts/amsserif25.amsfontatlas b/outputfonts/amsserif25.amsfontatlas new file mode 100644 index 0000000..6175e9b Binary files /dev/null and b/outputfonts/amsserif25.amsfontatlas differ diff --git a/outputfonts/amsserif25.png b/outputfonts/amsserif25.png new file mode 100644 index 0000000..b7c5565 Binary files /dev/null and b/outputfonts/amsserif25.png differ diff --git a/src/amsfontconverter4/amsfontconverter4_convertfontatlas.cpp b/src/amsfontconverter4/amsfontconverter4_convertfontatlas.cpp new file mode 100644 index 0000000..e86aa28 --- /dev/null +++ b/src/amsfontconverter4/amsfontconverter4_convertfontatlas.cpp @@ -0,0 +1,202 @@ +#include + +namespace ams +{ +namespace font4 +{ + + void convertfontatlas_v1(int argc, char* argv[]) + { + if(argc<7) + { + printf("amsmakefontatlas v1 use:\n"); + printf("amsmakefontatlas v1 [normalfont] [boldfont] [italicfont] [bolditalicfont] [charheight (integer)] [outputfile]\n"); + return; + } + + amsstring fnormal,fbold,fitalic,fbolditalic,fnum,foutput; + int charheight; + int res; + int tft; + + amsfontfamily ff; + amsfontatlas fa; + amsglyphrange gr; + + fnormal = argv[1]; + fbold = argv[2]; + fitalic = argv[3]; + fbolditalic = argv[4]; + fnum = argv[5]; + foutput = argv[6]; + + charheight = (int)fnum.strtonum(); + if(charheight<0) + { + charheight = 15; + } + + //debug + // printf("fnormal: %s\nfbold: %s\nfitalic %s\nfbolditalic: %s\ncharheight: %d\nfoutput %s\n", + // fnormal.cstring,fbold.cstring,fitalic.cstring,fbolditalic.cstring,charheight,foutput.cstring); + + //Unicode Ranges + //https://jrgraphix.net/research/unicode_blocks.php + // 0 - 0x07f - basic latin + // 0x00a0 - 0x0ff - extended latin + // 0x0370 - 0x03ff - greek and coptic + // 0x0400 - 0x04ff - cyrillic + // 0x0590 - 0x05ff - hebrew + + //Load normal fonts + tft = typefacetype_normal; + ff.charheight = charheight; + res = ft_load_glyphrange(fnormal.cstring,charheight,0,256,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fnormal.cstring,charheight,256,512,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fnormal.cstring,charheight,0x0370,0x03ff,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fnormal.cstring,charheight,0x0470,0x04ff,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fnormal.cstring,charheight,0x0590,0x059f,&gr); + gr.typefacetype = tft; ff.addrange(gr); + + //Load bold fonts + tft = typefacetype_bold; + res = ft_load_glyphrange(fbold.cstring,charheight,0,256,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fbold.cstring,charheight,256,512,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fbold.cstring,charheight,0x0370,0x03ff,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fbold.cstring,charheight,0x0470,0x04ff,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fbold.cstring,charheight,0x0590,0x059f,&gr); + gr.typefacetype = tft; ff.addrange(gr); + + //Load italic fonts + tft = typefacetype_italic; + res = ft_load_glyphrange(fitalic.cstring,charheight,0,256,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fitalic.cstring,charheight,256,512,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fitalic.cstring,charheight,0x0370,0x03ff,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fitalic.cstring,charheight,0x0470,0x04ff,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fitalic.cstring,charheight,0x0590,0x059f,&gr); + gr.typefacetype = tft; ff.addrange(gr); + + //Load bolditalic fonts + tft = typefacetype_bolditalic; + res = ft_load_glyphrange(fbolditalic.cstring,charheight,0,256,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fbolditalic.cstring,charheight,256,512,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fbolditalic.cstring,charheight,0x0370,0x03ff,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fbolditalic.cstring,charheight,0x0470,0x04ff,&gr); + gr.typefacetype = tft; ff.addrange(gr); + res = ft_load_glyphrange(fbolditalic.cstring,charheight,0x0590,0x059f,&gr); + gr.typefacetype = tft; ff.addrange(gr); + + ff.docalculations(); + ff.build_fontatlas(&fa); + fa.rendercontrol.spacewidth = (int)(0.5*(float)charheight); + fa.rendercontrol.tabwidth = 3*fa.rendercontrol.spacewidth; + + fa.save(foutput.cstring); + + return; + } + + void dumpfontatlastexture(int argc, char* argv[]) + { + int res; + amsstring finput, foutput; + amsfontatlas fa; + + if(argc<3) + { + printf("amsdumpfontatlastexture use:\n"); + printf("amsdumpfontatlastexture [fontatlasfile in] [imagefile out]\n"); + return; + } + + finput = argv[1]; + foutput = argv[2]; + + res = fa.load(finput.cstring); + if(res!=amsfont4_success) + { + printf("File %s failed to load.\n",finput.cstring); + return; + } + + write_image(foutput.cstring,&(fa.texture)); + + return; + } + + void testrendertextfile(int argc, char* argv[]) + { + amsstring ftext, ffont, foutput; + amsstring textfiletext; + amsfontatlas fa; + rendertext_simple_pars pars; + + if(argc<4) + { + printf("ams_testrendertextfile [textfilename] [fontatlasname] [outputimgname]"); + return; + } + + ftext = argv[1]; + ffont = argv[2]; + foutput = argv[3]; + + FILE *fp = NULL; + fp = fopen(ftext.cstring,"r"); + if(fp==NULL) + { + printf("error: could not open %s as a textfile.\n",ftext.cstring); + return; + } + freadtxtfile(fp,&textfiletext); + fclose(fp); fp = NULL; + + + int res; + res = fa.load(ffont.cstring); + if(res!=amsfont4_success) + { + printf("error: could not open %s as a font file.\n",ffont.cstring); + return; + } + + + //pars.charheight = fa.charheight; + pars.charheight = fa.rendercontrol.lineheight; + rendertext_simple_mesh mesh; + rendertext_simple( + textfiletext, + fa, + pars, + &mesh + ); + + amsimage img; + rendertext_rendertoimg( + &mesh, &fa, &img + ); + + write_image(foutput.cstring,&img); + + + + return; + } + +}; +}; \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index b5e7dc6..3fb5ba5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,14 +5,20 @@ using namespace ams::font4; int main(int argc, char* argv[]) { int ret = 0; - printf("ams fontconverter4 tests.\n"); + //printf("ams fontconverter4 tests.\n"); //ams::font4::test_getglyph1(); //ams::font4::test_getglyph2(); //ams::font4::test_facemetrics(); //ams::font4::test_glyphrange_load(); //test_load_fontfamily1(); - test_rendertext_simple1(); + //test_rendertext_simple1(); + + //convertfontatlas_v1(argc,argv); + //dumpfontatlastexture(argc,argv); + testrendertextfile(argc,argv); + + return ret; } \ No newline at end of file