OMGeeky/pytiled_parser
1
0
Fork 0
mirror of https://github.com/OMGeeky/pytiled_parser.git synced 2026-02-23 15:49:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from AberDerBart/master

Browse Source 
feat: tsx_file and parent_dir properties of TileSet, fixes #13
This commit is contained in:
Benjamin Kirkbride
2020-04-17 21:39:22 -04:00
committed by GitHub
parent b447b12c10 fae609deb6
commit 48f4ecf724
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pytiled_parser/objects.py
View File

@@ -444,6 +444,10 @@ class TileSet:
Ordered according to the terrain element's appearance in the TSX \ Ordered according to the terrain element's appearance in the TSX \
file. file.
tiles (Optional[Dict[int, Tile]]): Dict of Tile objects by Tile.id. tiles (Optional[Dict[int, Tile]]): Dict of Tile objects by Tile.id.
tsx_file (Path): Path of the file containing the tileset, \
None if loaded internally from a map
parent_dir (Path): Path of the parent directory of the file \
containing the tileset, None if loaded internally from a map
""" """
name: str name: str
@@ -459,6 +463,8 @@ class TileSet:
image: Optional[Image] = None image: Optional[Image] = None
terrain_types: Optional[List[Terrain]] = None terrain_types: Optional[List[Terrain]] = None
tiles: Optional[Dict[int, "Tile"]] = None tiles: Optional[Dict[int, "Tile"]] = None
tsx_file: Path = None
parent_dir: Path = None
TileSetDict = Dict[int, TileSet] TileSetDict = Dict[int, TileSet]

8
pytiled_parser/xml_parser.py
View File

@@ -465,9 +465,15 @@ def _parse_external_tile_set(
objects.Tileset: The tileset being parsed. objects.Tileset: The tileset being parsed.
""" """
source = Path(tile_set_element.attrib["source"]) source = Path(tile_set_element.attrib["source"])
resolved_path = parent_dir / source
tile_set_tree = etree.parse(str(parent_dir / Path(source))).getroot() tile_set_tree = etree.parse(str(parent_dir / Path(source))).getroot()
return _parse_tile_set(tile_set_tree) parsed_tile_set = _parse_tile_set(tile_set_tree)
parsed_tile_set.tsx_file = resolved_path
parsed_tile_set.parent_dir = resolved_path.parent
return parsed_tile_set
def _parse_points(point_string: str) -> List[objects.OrderedPair]: def _parse_points(point_string: str) -> List[objects.OrderedPair]: