From 65bfc2a498b37372bb159d6d7a20e559e989c09a Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Fri, 17 Dec 2021 20:04:11 -0500 Subject: [PATCH] First working TMX map parse at this point --- pytiled_parser/parsers/tmx/tiled_map.py | 4 ++-- pytiled_parser/parsers/tmx/tileset.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pytiled_parser/parsers/tmx/tiled_map.py b/pytiled_parser/parsers/tmx/tiled_map.py index c352a25..8ecb1f8 100644 --- a/pytiled_parser/parsers/tmx/tiled_map.py +++ b/pytiled_parser/parsers/tmx/tiled_map.py @@ -31,10 +31,10 @@ def parse(file: Path) -> TiledMap: # Is an external Tileset tileset_path = Path(parent_dir / raw_tileset.attrib["source"]) with open(tileset_path) as tileset_file: - raw_tileset = etree.parse(tileset_file).getroot() + raw_tileset_external = etree.parse(tileset_file).getroot() tilesets[int(raw_tileset.attrib["firstgid"])] = parse_tileset( - raw_tileset, + raw_tileset_external, int(raw_tileset.attrib["firstgid"]), external_path=tileset_path.parent, ) diff --git a/pytiled_parser/parsers/tmx/tileset.py b/pytiled_parser/parsers/tmx/tileset.py index cdc2e85..0d77b17 100644 --- a/pytiled_parser/parsers/tmx/tileset.py +++ b/pytiled_parser/parsers/tmx/tileset.py @@ -134,8 +134,9 @@ def parse( if raw_tileset.attrib.get("backgroundcolor") is not None: tileset.background_color = parse_color(raw_tileset.attrib["backgroundcolor"]) - image_element = raw_tileset.find("./image") - if image_element: + image_element = raw_tileset.find("image") + if image_element is not None: + print("here") if external_path: tileset.image = ( Path(external_path / image_element.attrib["source"]) @@ -153,7 +154,6 @@ def parse( if my_string[0] != "#": my_string = f"#{my_string}" tileset.transparent_color = parse_color(my_string) - pass tileoffset_element = raw_tileset.find("./tileoffset") if tileoffset_element: