浏览代码

Merge pull request #5954 from vnen/fix-icons-generation

Fix editor icons source file generation
Rémi Verschelde 9 年之前
父节点
当前提交
f06f6716eb
共有 2 个文件被更改,包括 1 次插入52 次删除
  1. 1 4
      tools/editor/icons/SCsub
  2. 0 48
      tools/editor/icons/make_icons.py

+ 1 - 4
tools/editor/icons/SCsub

@@ -37,12 +37,9 @@ def make_editor_icons_action(target, source, env):
 
 
 		pngf.close();
 		pngf.close();
 		var_str=os.path.basename(x)[:-4]+"_hidpi_png";
 		var_str=os.path.basename(x)[:-4]+"_hidpi_png";
-#print("TRY OPEN: "+os.path.dirname(x)+"/2x/"+os.path.basename(x)+"\n")
 		try:
 		try:
 
 
-			pngf = open(os.path.dirname(x)+"/2x/"+os.path.basename(x))
-
-			#print(var_str)
+			pngf = open(os.path.dirname(x)+"/2x/"+os.path.basename(x), "rb")
 
 
 			s.write("static const unsigned char "+ var_str +"[]={\n");
 			s.write("static const unsigned char "+ var_str +"[]={\n");
 
 

+ 0 - 48
tools/editor/icons/make_icons.py

@@ -1,48 +0,0 @@
-
-import glob
-
-pixmaps = glob.glob("*.png")
-
-f = open("../editor_icons.cpp","wb")
-
-
-f.write("#include \"editor_icons.h\"\n\n")
-f.write("#include \"scene/resources/theme.h\"\n\n")
-
-for x in pixmaps:
-
-	var_str=x[:-4]+"_png";
-
-	f.write("static const unsigned char "+ var_str +"[]={\n");
-
-	pngf=open(x,"rb");
-
-	b=pngf.read(1);
-	while(len(b)==1):
-		f.write(hex(ord(b)))
-		b=pngf.read(1);
-		if (len(b)==1):
-			f.write(",")
-
-	f.write("\n};\n\n\n");
-	pngf.close();
-
-f.write("static Ref<ImageTexture> make_icon(const uint8_t* p_png) {\n")
-f.write("\tRef<ImageTexture> texture( memnew( ImageTexture ) );\n")
-f.write("\ttexture->create_from_image( Image(p_png),ImageTexture::FLAG_FILTER );\n")
-f.write("\treturn texture;\n")
-f.write("}\n\n")
-
-f.write("void editor_register_icons(Ref<Theme> p_theme) {\n\n")
-
-
-for x in pixmaps:
-
-	type=x[5:-4].title().replace("_","");
-	var_str=x[:-4]+"_png";
-	f.write("\tp_theme->set_icon(\""+type+"\",\"EditorIcons\",make_icon("+var_str+"));\n");
-
-f.write("\n\n}\n\n");
-f.close()
-
-