Update all tests for template template update(#41)

This commit is contained in:
Darren Eberly
2021-07-28 22:38:10 -04:00
parent 30f52fd7ce
commit 29c04a39a9
27 changed files with 83 additions and 427 deletions

View File

@@ -21,11 +21,11 @@ EXPECTED = tiled_map.TiledMap(
image_height=199,
margin=1,
spacing=1,
firstgid=1,
name="tileset",
tile_count=48,
tile_height=32,
tile_width=32,
firstgid=1,
)
},
)

View File

@@ -85,6 +85,7 @@ EXPECTED = tiled_map.TiledMap(
tiled_version="1.6.0",
tile_height=32,
tile_width=32,
firstgid=1,
version="1.6",
type="tileset",
grid=tileset.Grid(orientation="orthogonal", width=1, height=1),

View File

@@ -143,6 +143,7 @@ EXPECTED = tiled_map.TiledMap(
.resolve(),
image_width=106,
image_height=72,
firstgid=1,
margin=0,
spacing=0,
name="tileset",

View File

@@ -21,6 +21,7 @@ EXPECTED = tiled_map.TiledMap(
.resolve(),
image_width=265,
image_height=199,
firstgid=1,
margin=1,
spacing=1,
name="tile_set_image",

View File

@@ -22,6 +22,7 @@ EXPECTED = tiled_map.TiledMap(
.resolve(),
image_width=265,
image_height=199,
firstgid=1,
margin=1,
spacing=1,
name="tile_set_image",

View File

@@ -24,33 +24,31 @@ EXPECTED = tiled_map.TiledMap(
type="",
),
tiled_object.Tile(
id=3,
coordinates=common_types.OrderedPair(
46.3682110303692, 112.993321292057
),
id=6,
coordinates=common_types.OrderedPair(46, 136.666666666667),
name="",
rotation=0,
type="",
visible=True,
size=common_types.Size(32, 32),
gid=30,
gid=49,
),
tiled_object.Tile(
id=5,
coordinates=common_types.OrderedPair(116, 145),
id=7,
coordinates=common_types.OrderedPair(141.333333333333, 148),
name="",
rotation=0,
type="",
visible=True,
size=common_types.Size(32, 32),
gid=1,
gid=50,
),
],
)
],
map_size=common_types.Size(8, 6),
next_layer_id=3,
next_object_id=6,
next_object_id=8,
orientation="orthogonal",
render_order="right-down",
tiled_version="1.7.1",
@@ -65,6 +63,7 @@ EXPECTED = tiled_map.TiledMap(
.resolve(),
image_width=265,
image_height=199,
firstgid=1,
margin=1,
spacing=1,
name="tile_set_image",
@@ -76,15 +75,33 @@ EXPECTED = tiled_map.TiledMap(
type="tileset",
),
49: tileset.Tileset(
columns=1,
image=Path(Path(__file__).parent / "../../images/tile_04.png")
.absolute()
.resolve(),
image_width=32,
image_height=32,
firstgid=49,
margin=0,
spacing=0,
name="tile_set_image_for_template",
tile_count=1,
tiled_version="1.7.1",
tile_height=32,
tile_width=32,
version="1.6",
type="tileset",
),
50: tileset.Tileset(
columns=0,
margin=0,
spacing=0,
name="tileset_single_image",
name="tile_set_single_image",
grid=tileset.Grid(orientation="orthogonal", width=1, height=1),
tiles={
0: tileset.Tile(
id=0,
image=Path(Path(__file__).parent / "../../images/tile_01.png")
image=Path(Path(__file__).parent / "../../images/tile_02.png")
.absolute()
.resolve(),
image_height=32,
@@ -95,6 +112,7 @@ EXPECTED = tiled_map.TiledMap(
tiled_version="1.7.1",
tile_height=32,
tile_width=32,
firstgid=50,
type="tileset",
version="1.6",
),

View File

@@ -10,21 +10,21 @@
"objects":[
{
"id":2,
"template":"template.json",
"template":"template-rectangle.json",
"x":98.4987608686521,
"y":46.2385012811358
},
{
"id":3,
"template":"template_tile.json",
"x":46.3682110303692,
"y":112.993321292057
"id":6,
"template":"template-tile-spritesheet.json",
"x":46,
"y":136.666666666667
},
{
"id":5,
"template":"template_tile_image.json",
"x":116,
"y":145
"id":7,
"template":"template-tile-image.json",
"x":141.333333333333,
"y":148
}],
"opacity":1,
"type":"objectgroup",
@@ -33,7 +33,7 @@
"y":0
}],
"nextlayerid":3,
"nextobjectid":6,
"nextobjectid":8,
"orientation":"orthogonal",
"properties":[
{
@@ -76,7 +76,7 @@
},
{
"firstgid":49,
"source":"tileset_single_image.json"
"source":"tile_set_image_for_template.json"
}],
"tilewidth":32,
"type":"map",

View File

@@ -2,7 +2,7 @@
{
"gid":1,
"height":32,
"id":4,
"id":7,
"name":"",
"rotation":0,
"type":"",
@@ -12,7 +12,7 @@
"tileset":
{
"firstgid":1,
"source":"tileset_single_image.json"
"source":"tile_set_single_image.json"
},
"type":"template"
}

View File

@@ -1,8 +1,8 @@
{ "object":
{
"gid":30,
"gid":1,
"height":32,
"id":3,
"id":6,
"name":"",
"rotation":0,
"type":"",
@@ -12,7 +12,7 @@
"tileset":
{
"firstgid":1,
"source":"tileset.json"
"source":"tile_set_image_for_template.json"
},
"type":"template"
}

View File

@@ -0,0 +1,14 @@
{ "columns":1,
"image":"..\/..\/images\/tile_04.png",
"imageheight":32,
"imagewidth":32,
"margin":0,
"name":"tile_set_image_for_template",
"spacing":0,
"tilecount":1,
"tiledversion":"1.7.1",
"tileheight":32,
"tilewidth":32,
"type":"tileset",
"version":"1.6"
}

View File

@@ -6,7 +6,7 @@
"width":1
},
"margin":0,
"name":"tileset_single_image",
"name":"tile_set_single_image",
"spacing":0,
"tilecount":1,
"tiledversion":"1.7.1",
@@ -14,7 +14,7 @@
"tiles":[
{
"id":0,
"image":"..\/..\/images\/tile_01.png",
"image":"..\/..\/images\/tile_02.png",
"imageheight":32,
"imagewidth":32
}],