From ef6c2f4b5bb6d8e12384be858356335bb75001f3 Mon Sep 17 00:00:00 2001 From: JP Cimalando Date: Tue, 12 Feb 2019 15:51:53 +0100 Subject: [PATCH] Replace png2c with a more generic program (#131) --- utils/{png2c.py => res2c.py} | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) rename utils/{png2c.py => res2c.py} (82%) diff --git a/utils/png2c.py b/utils/res2c.py similarity index 82% rename from utils/png2c.py rename to utils/res2c.py index ab023658..978af8b9 100755 --- a/utils/png2c.py +++ b/utils/res2c.py @@ -19,7 +19,7 @@ import os, sys # ----------------------------------------------------- -def png2c(namespace, filenames): +def res2c(namespace, filenames): fdH = open("%s.hpp" % namespace, "w") fdH.write("/* (Auto-generated binary data file). */\n") @@ -42,12 +42,12 @@ def png2c(namespace, filenames): shortFilename = filename.rsplit(os.sep, 1)[-1].split(".", 1)[0] shortFilename = shortFilename.replace("-", "_") - pngData = open(filename, 'rb').read() + resData = open(filename, 'rb').read() print("Generating data for \"%s\"" % (filename)) fdH.write(" extern const char* %sData;\n" % shortFilename) - fdH.write(" const unsigned int %sDataSize = %i;\n" % (shortFilename, len(pngData))) + fdH.write(" const unsigned int %sDataSize = %i;\n" % (shortFilename, len(resData))) if tempIndex != len(filenames): fdH.write("\n") @@ -57,7 +57,7 @@ def png2c(namespace, filenames): curColumn = 1 fdC.write(" ") - for data in pngData: + for data in resData: if curColumn == 0: fdC.write(" ") @@ -90,24 +90,24 @@ def png2c(namespace, filenames): if __name__ == '__main__': if len(sys.argv) != 3: - print("Usage: %s " % sys.argv[0]) + print("Usage: %s " % sys.argv[0]) quit() namespace = sys.argv[1].replace("-","_") - artFolder = sys.argv[2] + resFolder = sys.argv[2] - if not os.path.exists(artFolder): - print("Folder '%s' does not exist" % artFolder) + if not os.path.exists(resFolder): + print("Folder '%s' does not exist" % resFolder) quit() - # find png files - pngFiles = [] + # find resource files + resFiles = [] - for root, dirs, files in os.walk(artFolder): - for name in [name for name in files if name.lower().endswith(".png")]: - pngFiles.append(os.path.join(root, name)) + for root, dirs, files in os.walk(resFolder): + for name in files: + resFiles.append(os.path.join(root, name)) - pngFiles.sort() + resFiles.sort() # create code now - png2c(namespace, pngFiles) + res2c(namespace, resFiles)