Skip to content

Pass custom property types through #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joereynolds wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pass custom property types through #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pytmx/pytmx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ def __init__(
self.imagemap[(0, 0)] = 0

if custom_property_filename:
self.parse_json(json.load(open(custom_property_filename)))
self.parse_json(json.load(open(custom_property_filename))["propertyTypes"])

if filename:
self.parse_xml(ElementTree.parse(self.filename).getroot())
Expand All @@ -558,7 +558,7 @@ def __iter__(self):
return chain(self.layers, self.objects)

def _set_properties(self, node: ElementTree.Element) -> None:
TiledElement._set_properties(self, node)
TiledElement._set_properties(self, node, self.custom_types)

# TODO: make class/layer-specific type casting
# layer height and width must be int, but TiledElement.set_properties()
Expand Down Expand Up @@ -1259,7 +1259,7 @@ def parse_xml(self, node: ElementTree.Element) -> "TiledTileset":
tiled_gid = int(child.get("id"))

p = {k: types[k](v) for k, v in child.items()}
p.update(parse_properties(child))
p.update(parse_properties(child, self.parent.custom_types))

# images are listed as relative to the .tsx file, not the .tmx file:
if source and "path" in p:
Expand Down