Fix for object template loading inside tilesets (pythonarcade#82)

Author: Cleptomania

pytiled_parser/parsers/json/tileset.py

@@ -182,7 +182,7 @@ def _parse_tile(
  tile.animation.append(_parse_frame(frame))
 
  if raw_tile.get("objectgroup") is not None:
- tile.objects = parse_layer(raw_tile["objectgroup"], encoding)
+ tile.objects = parse_layer(raw_tile["objectgroup"], encoding, external_path)
 
  if raw_tile.get("properties") is not None:
  tile.properties = parse_properties(raw_tile["properties"])

pytiled_parser/parsers/tmx/tileset.py

@@ -91,7 +91,7 @@ def _parse_tile(
 
  object_element = raw_tile.find("./objectgroup")
  if object_element is not None:
- tile.objects = parse_layer(object_element, encoding)
+ tile.objects = parse_layer(object_element, encoding, external_path)
 
  properties_element = raw_tile.find("./properties")
  if properties_element is not None:

tests/test_data/map_tests/template/expected.py

@@ -110,6 +110,32 @@
  image_width=32,
  width=32,
  height=32,
+ objects=layer.ObjectLayer(
+ id=2,
+ name="",
+ draw_order="index",
+ opacity=1,
+ visible=True,
+ parallax_factor=common_types.OrderedPair(1.0, 1.0),
+ coordinates=common_types.OrderedPair(0, 0),
+ tiled_objects=[
+ tiled_object.Rectangle(
+ id=1,
+ name="test",
+ rotation=0,
+ size=common_types.Size(
+ 63.6585878103079, 38.2811778048473
+ ),
+ coordinates=common_types.OrderedPair(9.5, 3.0),
+ properties={
+ "test": "world",
+ "testtest": "fromtemplate",
+ },
+ visible=True,
+ class_="",
+ ),
+ ],
+ ),
  )
  },
  tile_count=1,

tests/test_data/map_tests/template/template-rectangle.json

@@ -2,7 +2,7 @@
  {
  "height":38.2811778048473,
  "id":1,
- "name":"",
+ "name":"test",
  "rotation":0,
  "class":"",
  "visible":true,

tests/test_data/map_tests/template/tile_set_single_image.json

@@ -9,16 +9,34 @@
  "name":"tile_set_single_image",
  "spacing":0,
  "tilecount":1,
- "tiledversion":"1.7.1",
+ "tiledversion":"1.9.2",
  "tileheight":32,
  "tiles":[
  {
  "id":0,
  "image":"..\/..\/images\/tile_02.png",
  "imageheight":32,
- "imagewidth":32
+ "imagewidth":32,
+ "objectgroup":
+ {
+ "draworder":"index",
+ "id":2,
+ "name":"",
+ "objects":[
+ {
+ "id":1,
+ "template":"template-rectangle.json",
+ "x":9.5,
+ "y":3
+ }],
+ "opacity":1,
+ "type":"objectgroup",
+ "visible":true,
+ "x":0,
+ "y":0
+ }
  }],
  "tilewidth":32,
  "type":"tileset",
- "version":"1.6"
+ "version":"1.9"
 }

tests/test_data/map_tests/template/tile_set_single_image.tsx

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_single_image" tilewidth="32" tileheight="32" tilecount="1" columns="0">
+<tileset version="1.9" tiledversion="1.9.2" name="tile_set_single_image" tilewidth="32" tileheight="32" tilecount="1" columns="0">
  <grid orientation="orthogonal" width="1" height="1"/>
  <tile id="0">
  <image width="32" height="32" source="../../images/tile_02.png"/>
+ <objectgroup draworder="index" id="2">
+ <object id="1" template="template-rectangle.tx" x="9.5" y="3"/>
+ </objectgroup>
  </tile>
 </tileset>