pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Icons.xml not respecting asset stack (#1160)

Browse Source 
* fix Icons.xml not respecting asset stack

* resolve xml path in icons.py rather than configure

* I think fix

---------

Co-authored-by: Ethan <ethteck@gmail.com>
This commit is contained in:
Alex Bates 2024-02-03 16:35:31 +00:00 committed by GitHub
parent 540757c7e2
commit 9f0452dd0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/build/configure.py
View File

@ -253,7 +253,7 @@ def write_ninja_rules(
ninja.rule( ninja.rule(
"icons", "icons",
command=f"$python {BUILD_TOOLS}/icons.py $out $list_path $header_path $asset_stack", command=f"$python {BUILD_TOOLS}/icons.py $out $header_path $asset_stack",
) )
ninja.rule( ninja.rule(
@ -941,7 +941,6 @@ class Configure:
entry.src_paths, entry.src_paths,
"icons", "icons",
variables={ variables={
"list_path": entry.src_paths[0],
"header_path": header_path, "header_path": header_path,
"asset_stack": ",".join(self.asset_stack), "asset_stack": ",".join(self.asset_stack),
}, },

9
tools/build/icons.py
View File

@ -28,7 +28,7 @@ def get_img_file(fmt_str, img_file: str):
palette = img.palette(alpha="force") palette = img.palette(alpha="force")
for rgba in palette: for rgba in palette:
if rgba[3] not in (0, 0xFF): if rgba[3] not in (0, 0xFF):
self.warn("alpha mask mode but translucent pixels used") print("alpha mask mode but translucent pixels used")
color = pack_color(*rgba) color = pack_color(*rgba)
out_pal += color.to_bytes(2, byteorder="big") out_pal += color.to_bytes(2, byteorder="big")
@ -36,11 +36,11 @@ def get_img_file(fmt_str, img_file: str):
return (out_img, out_pal, out_w, out_h) return (out_img, out_pal, out_w, out_h)
def build(out_bin: Path, in_xml: Path, out_header: Path, asset_stack: Tuple[Path, ...]): def build(out_bin: Path, out_header: Path, asset_stack: Tuple[Path, ...]):
out_bytes = bytearray() out_bytes = bytearray()
offsets: Dict[str, int] = {} offsets: Dict[str, int] = {}
xml = ET.parse(in_xml) xml = ET.parse(get_asset_path(Path("icon/Icons.xml"), asset_stack))
IconList = xml.getroot() IconList = xml.getroot()
for Icon in IconList.findall("Icon"): for Icon in IconList.findall("Icon"):
@ -100,11 +100,10 @@ def build(out_bin: Path, in_xml: Path, out_header: Path, asset_stack: Tuple[Path
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser(description="Icon archive") parser = argparse.ArgumentParser(description="Icon archive")
parser.add_argument("out_bin", type=Path, help="output binary file path") parser.add_argument("out_bin", type=Path, help="output binary file path")
parser.add_argument("list_path", type=Path, help="input xml file path")
parser.add_argument("header_path", type=Path, help="output header file to generate") parser.add_argument("header_path", type=Path, help="output header file to generate")
parser.add_argument("asset_stack", help="comma-separated asset stack") parser.add_argument("asset_stack", help="comma-separated asset stack")
args = parser.parse_args() args = parser.parse_args()
asset_stack = tuple(Path(d) for d in args.asset_stack.split(",")) asset_stack = tuple(Path(d) for d in args.asset_stack.split(","))
build(args.out_bin, args.list_path, args.header_path, asset_stack) build(args.out_bin, args.header_path, asset_stack)