X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=makefont.py;h=1651ace694eab7f2923b539db489f30e467434c5;hb=85c82f93f4874bcf0b04332c9abb62cd2a5b181b;hp=ac816633bca2fc6e6efed5c372fa8a4a813665c9;hpb=652cb91c2b6008c4407c16054085f20bf5888c4d;p=libs%2Fgl.git

diff --git a/makefont.py b/makefont.py
index ac816633..1651ace6 100755
--- a/makefont.py
+++ b/makefont.py
@@ -8,7 +8,7 @@ def convert_def(fn):
 	line=src.readline()
 	tw,th,fh,fa,fd=map(int, line.split())
 
-	result="default_size %d;\n"%fh
+	result="native_size %d;\n"%fh
 	result+="ascent %.3f;\n"%(float(fa)/fh)
 	result+="descent %.3f;\n"%(float(fd)/fh)
 
@@ -23,14 +23,14 @@ def convert_def(fn):
 
 	return result
 
-def make_font(fn):
+def make_font(fn, size):
 	import maketex
 	import os
 
-	if os.system("ttf2png \"%s\" -o makefont-tmp.png -d makefont-tmp.def -t -p"%sys.argv[1]):
+	if os.system("ttf2png \"%s\" -o makefont-tmp.png -d makefont-tmp.def -t -p -s %d"%(fn, size)):
 		raise Exception("Could not execute ttf2png")
 
-	result="texture_inline\n{\n"
+	result="texture\n{\n"
 	result+=maketex.make_tex("makefont-tmp.png")
 	result+="};\n"
 	result+=convert_def("makefont-tmp.def")
@@ -43,8 +43,9 @@ def make_font(fn):
 if __name__=="__main__":
 	import sys
 
-	if len(sys.argv)<3:
-		print "Usage: %s <font.ttf> <outfile>"
+	if len(sys.argv)<4:
+		import os
+		print "Usage: %s <font.ttf> <outfile> <size>"%os.path.basename(sys.argv[0])
 	else:
 		out=file(sys.argv[2], "w")
-		out.write(make_font(sys.argv[1]))
+		out.write(make_font(sys.argv[1], int(sys.argv[3])))