Check the flat qualifier from the correct member

[libs/gl.git] / scripts / maketex.py

diff --git a/scripts/maketex.py b/scripts/maketex.py
index 92a284215796b1021ce8ca55f8098a668cc658e6..72ff49acb7a1173e536a72721bed4844bd7f5065 100755 (executable)
--- a/scripts/maketex.py
+++ b/scripts/maketex.py
@@ -1,46 +1,71 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 def escape(str):
-       result=""
+       result = ""
        for c in str:
                if c=='"':
-                       result+='\\"'
+                       result += '\\"'
                elif c=='\\':
-                       result+='\\\\'
+                       result += '\\\\'
                elif ord(c)<0x20:
-                       result+="\\%03o"%ord(c)
+                       result += "\\{:03o}".format(ord(c))
                else:
-                       result+=c
-       return result;
+                       result += c
+       return result
+
+def values(data, size):
+       for y in range(size[1]-1, -1, -1):
+               for x in range(size[0]):
+                       yield data[x+y*size[0]]
+
+def values_multi(data, size):
+       for y in range(size[1]-1, -1, -1):
+               for x in range(size[0]):
+                       for c in data[x+y*size[0]]:
+                               yield c
 
-def make_tex(fn):
-       import Image
+def make_tex(fn, mipmap=False, srgb=False):
+       from PIL import Image
+       import base64
+       import codecs
 
-       img=Image.open(fn)
+       img = Image.open(fn)
 
-       fmt="".join(img.getbands())
+       fmt = "".join(img.getbands())
        if fmt=="LA":
-               fmt="LUMINANCE_ALPHA"
+               fmt = "LUMINANCE8_ALPHA8"
        elif fmt=="L":
-               fmt="LUMINANCE"
+               fmt = "LUMINANCE8"
 
-       result="storage %s %d %d;\n"%(fmt, img.size[0], img.size[1])
-       result+="min_filter LINEAR;\n"
-       result+="raw_data \""
-       data=list(img.getdata())
-       for y in range(img.size[1]):
-               i=(img.size[1]-1-y)*img.size[0]
-               result+=escape("".join(["".join([chr(v) for v in p]) for p in data[i:i+img.size[0]]]))
-       result+="\";\n"
+       if srgb:
+               fmt = "S"+fmt
+
+       result = "storage {} {} {};\n".format(fmt, img.size[0], img.size[1])
+       if mipmap:
+               result += "generate_mipmap true;\n"
+
+       if len(img.getbands())==1:
+               pixels = values(img.getdata(), img.size)
+       else:
+               pixels = values_multi(img.getdata(), img.size)
+       result += "raw_data ={}=;\n".format(codecs.decode(base64.b64encode(bytes(pixels)), "ascii"))
 
        return result
 
 if __name__=="__main__":
-       import sys
        import os
+       import argparse
 
-       if len(sys.argv)<2:
-               print "Usage: %s <image>"%sys.argv[0]
-       else:
-               out=file(os.path.splitext(sys.argv[1])[0]+".tex", "w")
-               out.write(make_tex(sys.argv[1]))
+       parser = argparse.ArgumentParser()
+       parser.add_argument("-o", "--output", metavar="FILE", help="Output filename")
+       parser.add_argument("-m", "--mipmap", action="store_true", help="Enable mipmaps")
+       parser.add_argument("--srgb", action="store_const", const=True, help="Use sRGB color space")
+       parser.add_argument("image")
+
+       args = parser.parse_args()
+
+       out_fn = args.output
+       if not out_fn:
+               out_fn = os.path.splitext(args.image)[0]+".tex2d"
+       out = open(out_fn, "w")
+       out.write(make_tex(args.image, args.mipmap, args.srgb))