From ee31badbd85f64eaca16c3a2e9db217465992a69 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Thu, 5 Sep 2013 22:22:00 +0300 Subject: [PATCH] Make the font script compatible with new ttf2png output --- scripts/makefont.py | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/scripts/makefont.py b/scripts/makefont.py index ad12fee8..84e9c609 100755 --- a/scripts/makefont.py +++ b/scripts/makefont.py @@ -3,21 +3,26 @@ 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) - 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" return result -- 2.43.0