X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=scripts%2Fmakefont.py;h=8cc9b17c6e49de535f9b769c6e141d395e9ac8a0;hb=bdced13c0814d1a860573a0ac19964da2ac4d5e1;hp=e0b587938a5b80a85187a5e21c75a5c6f364df6e;hpb=aa6020a158c85fdb3b7e9993065861dd1b6531ad;p=libs%2Fgl.git

diff --git a/scripts/makefont.py b/scripts/makefont.py
index e0b58793..8cc9b17c 100755
--- a/scripts/makefont.py
+++ b/scripts/makefont.py
@@ -1,23 +1,31 @@
 #!/usr/bin/python
 
 def convert_def(fn):
-	src=file(fn)
-
-	line=src.readline()
-	tw,th,fh,fa,fd=map(int, line.split())
-
-	result="native_size %d;\n"%fh
-	result+="ascent %.3f;\n"%(float(fa)/fh)
-	result+="descent %.3f;\n"%(float(fd)/fh)
+	src = file(fn)
 
 	for line in src.readlines():
-		g,x,y,w,h,ox,oy,a=map(int, line.split())
-		result+="glyph %d\n{\n"%g
-		result+="\ttexcoords %f %f %f %f;\n"%(float(x)/tw, float(th-y-h)/th, float(x+w)/tw, float(th-y)/th)
-		result+="\tsize %.3f %.3f;\n"%(float(w)/fh, float(h)/fh)
-		result+="\toffset %.3f %.3f;\n"%(float(ox)/fh, float(oy)/fh)
-		result+="\tadvance %.3f;\n"%(float(a)/fh)
-		result+="};\n"
+		line = line.strip()
+		if not line or line[0]=='#':
+			continue
+
+		parts = line.split()
+
+		if parts[0]=="font":
+			tw, th, fh, fa, fd = map(int, parts[1:])
+			result = "native_size %d;\n"%fh
+			result += "ascent %.3f;\n"%(float(fa)/fh)
+			result += "descent %.3f;\n"%(float(fd)/fh)
+		elif parts[0]=="glyph":
+			g, x, y, w, h, ox, oy, a = map(int, parts[1:])
+			result += "glyph %d\n{\n"%g
+			result += "\ttexcoords %f %f %f %f;\n"%(float(x)/tw, float(th-y-h)/th, float(x+w)/tw, float(th-y)/th)
+			result += "\tsize %.3f %.3f;\n"%(float(w)/fh, float(h)/fh)
+			result += "\toffset %.3f %.3f;\n"%(float(ox)/fh, float(oy)/fh)
+			result += "\tadvance %.3f;\n"%(float(a)/fh)
+			result += "};\n"
+		elif parts[0]=="kern":
+			l, r, d = map(int, parts[1:])
+			result += "kerning %d %d %.3f;\n"%(l, r, float(d)/fh)
 
 	return result
 
@@ -28,11 +36,10 @@ def make_font(fn, size):
 	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\n{\n"
-	result+="wrap CLAMP_TO_EDGE;\n"
-	result+=maketex.make_tex("makefont-tmp.png")
-	result+="};\n"
-	result+=convert_def("makefont-tmp.def")
+	result = "texture\n{\n"
+	result += maketex.make_tex("makefont-tmp.png", wrap="CLAMP_TO_EDGE")
+	result += "};\n"
+	result += convert_def("makefont-tmp.def")
 
 	os.unlink("makefont-tmp.png")
 	os.unlink("makefont-tmp.def")
@@ -46,5 +53,5 @@ if __name__=="__main__":
 		import os
 		print "Usage: %s <font.ttf> <outfile> <size>"%os.path.basename(sys.argv[0])
 	else:
-		out=file(sys.argv[2], "w")
+		out = file(sys.argv[2], "w")
 		out.write(make_font(sys.argv[1], int(sys.argv[3])))