From c68a939cf9a5114311ffc3da14b3011310fd89e2 Mon Sep 17 00:00:00 2001 From: Benjamin Kirkbride Date: Tue, 2 Jun 2020 20:35:42 -0400 Subject: [PATCH 1/2] test:chore: organized all the current test maps --- .../all_objects.json} | 4 +- .../tileset_image.json} | 2 +- .../tileset_image_objects.json} | 6 +- .../simple_external_tileset/map.json | 68 ----- .../map_simple_external_tileset.json} | 2 +- .../tileset_image.json} | 4 +- .../map_infinite.json} | 2 +- .../simple_infinite/tileset_image.json | 14 + .../map_simple_offset.json} | 2 +- .../simple_offset/tileset_image.json | 14 + tests/test_data/test_map_image_tile_set.json | 255 ------------------ tests/test_data/test_map_simple_meme.json | 70 ----- 12 files changed, 39 insertions(+), 404 deletions(-) rename tests/test_data/{simple_objects.json => all_objects/all_objects.json} (99%) rename tests/test_data/{simple_external_tileset/tile_set.json => all_objects/tileset_image.json} (99%) rename tests/test_data/{tile_set_image_objects.json => all_objects/tileset_image_objects.json} (98%) delete mode 100644 tests/test_data/simple_external_tileset/map.json rename tests/test_data/{test_map_simple.json => simple_external_tileset/map_simple_external_tileset.json} (97%) rename tests/test_data/{tile_set_image.json => simple_external_tileset/tileset_image.json} (81%) rename tests/test_data/{test_map_infinite.json => simple_infinite/map_infinite.json} (99%) create mode 100644 tests/test_data/simple_infinite/tileset_image.json rename tests/test_data/{test_map_simple_offset.json => simple_offset/map_simple_offset.json} (97%) create mode 100644 tests/test_data/simple_offset/tileset_image.json delete mode 100644 tests/test_data/test_map_image_tile_set.json delete mode 100644 tests/test_data/test_map_simple_meme.json diff --git a/tests/test_data/simple_objects.json b/tests/test_data/all_objects/all_objects.json similarity index 99% rename from tests/test_data/simple_objects.json rename to tests/test_data/all_objects/all_objects.json index dbf407c..c75c2ea 100644 --- a/tests/test_data/simple_objects.json +++ b/tests/test_data/all_objects/all_objects.json @@ -635,11 +635,11 @@ "tilesets": [ { "firstgid": 1, - "source": "../../old_tests/test_data/tile_set_image_objects.tsx" + "source": "tileset_image_objects.json" }, { "firstgid": 49, - "source": "../../old_tests/test_data/tile_set_image.tsx" + "source": "tileset_image.json" } ], "tilewidth": 32, diff --git a/tests/test_data/simple_external_tileset/tile_set.json b/tests/test_data/all_objects/tileset_image.json similarity index 99% rename from tests/test_data/simple_external_tileset/tile_set.json rename to tests/test_data/all_objects/tileset_image.json index c1431bb..8f3b73e 100644 --- a/tests/test_data/simple_external_tileset/tile_set.json +++ b/tests/test_data/all_objects/tileset_image.json @@ -11,4 +11,4 @@ "tilewidth":32, "type":"tileset", "version":1.2 -} \ No newline at end of file +} diff --git a/tests/test_data/tile_set_image_objects.json b/tests/test_data/all_objects/tileset_image_objects.json similarity index 98% rename from tests/test_data/tile_set_image_objects.json rename to tests/test_data/all_objects/tileset_image_objects.json index 83a46ff..6ceb5be 100644 --- a/tests/test_data/tile_set_image_objects.json +++ b/tests/test_data/all_objects/tileset_image_objects.json @@ -1,11 +1,11 @@ { "columns":8, - "image":"images\/tmw_desert_spacing.png", + "image":"..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, "margin":1, "name":"tile_set_image", "spacing":1, - "tilecount":48, + "tilecount":5, "tiledversion":"1.3.1", "tileheight":32, "tiles":[ @@ -189,4 +189,4 @@ "tilewidth":32, "type":"tileset", "version":1.2 -} \ No newline at end of file +} diff --git a/tests/test_data/simple_external_tileset/map.json b/tests/test_data/simple_external_tileset/map.json deleted file mode 100644 index 1b89be4..0000000 --- a/tests/test_data/simple_external_tileset/map.json +++ /dev/null @@ -1,68 +0,0 @@ -{ "compressionlevel":0, - "height":6, - "infinite":false, - "layers":[ - { - "data":[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48], - "height":6, - "id":1, - "name":"Tile Layer 1", - "opacity":1, - "type":"tilelayer", - "visible":true, - "width":8, - "x":0, - "y":0 - }], - "nextlayerid":2, - "nextobjectid":1, - "orientation":"orthogonal", - "properties":[ - { - "name":"bool property - false", - "type":"bool", - "value":false - }, - { - "name":"bool property - true", - "type":"bool", - "value":true - }, - { - "name":"color property", - "type":"color", - "value":"#ff49fcff" - }, - { - "name":"file property", - "type":"file", - "value":"..\/..\/..\/..\/..\/..\/..\/var\/log\/syslog" - }, - { - "name":"float property", - "type":"float", - "value":1.23456789 - }, - { - "name":"int property", - "type":"int", - "value":13 - }, - { - "name":"string property", - "type":"string", - "value":"Hello, World!!" - }], - "renderorder":"right-down", - "tiledversion":"1.3.1", - "tileheight":32, - "tilesets":[ - { - "firstgid":1, - "source":"tile_set.json" - }], - "tilewidth":32, - "type":"map", - "version":1.2, - "width":8 -} \ No newline at end of file diff --git a/tests/test_data/test_map_simple.json b/tests/test_data/simple_external_tileset/map_simple_external_tileset.json similarity index 97% rename from tests/test_data/test_map_simple.json rename to tests/test_data/simple_external_tileset/map_simple_external_tileset.json index 56f0c67..e68a7f7 100644 --- a/tests/test_data/test_map_simple.json +++ b/tests/test_data/simple_external_tileset/map_simple_external_tileset.json @@ -59,7 +59,7 @@ "tilesets":[ { "firstgid":1, - "source":"tile_set_image.json" + "source":"tileset_image.json" }], "tilewidth":32, "type":"map", diff --git a/tests/test_data/tile_set_image.json b/tests/test_data/simple_external_tileset/tileset_image.json similarity index 81% rename from tests/test_data/tile_set_image.json rename to tests/test_data/simple_external_tileset/tileset_image.json index 25b87a2..8f3b73e 100644 --- a/tests/test_data/tile_set_image.json +++ b/tests/test_data/simple_external_tileset/tileset_image.json @@ -1,5 +1,5 @@ { "columns":8, - "image":"images\/tmw_desert_spacing.png", + "image":"..\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, "margin":1, @@ -11,4 +11,4 @@ "tilewidth":32, "type":"tileset", "version":1.2 -} \ No newline at end of file +} diff --git a/tests/test_data/test_map_infinite.json b/tests/test_data/simple_infinite/map_infinite.json similarity index 99% rename from tests/test_data/test_map_infinite.json rename to tests/test_data/simple_infinite/map_infinite.json index 01d9432..2543f7b 100644 --- a/tests/test_data/test_map_infinite.json +++ b/tests/test_data/simple_infinite/map_infinite.json @@ -186,7 +186,7 @@ "tilesets":[ { "firstgid":1, - "source":"tile_set_image.json" + "source":"tileset_image.json" }], "tilewidth":32, "type":"map", diff --git a/tests/test_data/simple_infinite/tileset_image.json b/tests/test_data/simple_infinite/tileset_image.json new file mode 100644 index 0000000..8f3b73e --- /dev/null +++ b/tests/test_data/simple_infinite/tileset_image.json @@ -0,0 +1,14 @@ +{ "columns":8, + "image":"..\/images\/tmw_desert_spacing.png", + "imageheight":199, + "imagewidth":265, + "margin":1, + "name":"tile_set_image", + "spacing":1, + "tilecount":48, + "tiledversion":"1.3.1", + "tileheight":32, + "tilewidth":32, + "type":"tileset", + "version":1.2 +} diff --git a/tests/test_data/test_map_simple_offset.json b/tests/test_data/simple_offset/map_simple_offset.json similarity index 97% rename from tests/test_data/test_map_simple_offset.json rename to tests/test_data/simple_offset/map_simple_offset.json index 0a23653..bea06b9 100644 --- a/tests/test_data/test_map_simple_offset.json +++ b/tests/test_data/simple_offset/map_simple_offset.json @@ -71,7 +71,7 @@ "tilesets":[ { "firstgid":1, - "source":"tile_set_image.json" + "source":"tileset_image.json" }], "tilewidth":32, "type":"map", diff --git a/tests/test_data/simple_offset/tileset_image.json b/tests/test_data/simple_offset/tileset_image.json new file mode 100644 index 0000000..8f3b73e --- /dev/null +++ b/tests/test_data/simple_offset/tileset_image.json @@ -0,0 +1,14 @@ +{ "columns":8, + "image":"..\/images\/tmw_desert_spacing.png", + "imageheight":199, + "imagewidth":265, + "margin":1, + "name":"tile_set_image", + "spacing":1, + "tilecount":48, + "tiledversion":"1.3.1", + "tileheight":32, + "tilewidth":32, + "type":"tileset", + "version":1.2 +} diff --git a/tests/test_data/test_map_image_tile_set.json b/tests/test_data/test_map_image_tile_set.json deleted file mode 100644 index 954d5c5..0000000 --- a/tests/test_data/test_map_image_tile_set.json +++ /dev/null @@ -1,255 +0,0 @@ -{ "compressionlevel":0, - "height":10, - "infinite":false, - "layers":[ - { - "data":[1, 2, 3, 4, 5, 6, 7, 8, 30, 30, 9, 10, 11, 12, 13, 14, 15, 16, 30, 30, 17, 18, 19, 20, 21, 22, 23, 24, 30, 30, 25, 26, 27, 28, 29, 30, 31, 32, 30, 30, 33, 34, 35, 36, 37, 38, 39, 40, 30, 30, 41, 42, 43, 44, 45, 46, 47, 48, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30], - "height":10, - "id":1, - "name":"Tile Layer 1", - "opacity":1, - "type":"tilelayer", - "visible":true, - "width":10, - "x":0, - "y":0 - }, - { - "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 7, 7, 7, 7, 7, 8, 0, 0, 0, 14, 15, 15, 15, 15, 15, 16, 0, 0, 0, 22, 23, 23, 23, 23, 23, 24, 0], - "height":10, - "id":2, - "name":"Tile Layer 2", - "opacity":0.5, - "type":"tilelayer", - "visible":true, - "width":10, - "x":0, - "y":0 - }, - { - "id":3, - "layers":[ - { - "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - "height":10, - "id":5, - "name":"Tile Layer 4", - "offsetx":49, - "offsety":-50, - "opacity":1, - "type":"tilelayer", - "visible":true, - "width":10, - "x":0, - "y":0 - }, - { - "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 9, 10, 11, 0, 0, 0, 0, 0, 0, 0, 17, 18, 19, 0, 0, 0, 0, 0, 0, 0], - "height":10, - "id":4, - "name":"Tile Layer 3", - "opacity":1, - "type":"tilelayer", - "visible":true, - "width":10, - "x":0, - "y":0 - }], - "name":"Group 1", - "opacity":1, - "properties":[ - { - "name":"bool property", - "type":"bool", - "value":true - }], - "type":"group", - "visible":true, - "x":0, - "y":0 - }, - { - "color":"#000000", - "draworder":"index", - "id":6, - "name":"Object Layer 1", - "objects":[ - { - "height":25, - "id":1, - "name":"rectangle 1", - "rotation":15, - "type":"rectangle type", - "visible":true, - "width":47.25, - "x":200.25, - "y":210.75 - }, - { - "height":0, - "id":2, - "name":"polygon 1", - "polygon":[ - { - "x":0, - "y":0 - }, - { - "x":-41.25, - "y":24.25 - }, - { - "x":-11, - "y":67.25 - }, - { - "x":25.75, - "y":39.75 - }, - { - "x":-9, - "y":37.75 - }], - "rotation":-21, - "type":"polygon type", - "visible":true, - "width":0, - "x":252.5, - "y":87.75 - }, - { - "ellipse":true, - "height":14.25, - "id":3, - "name":"elipse 1", - "rotation":0, - "type":"elipse type", - "visible":true, - "width":17.75, - "x":198.75, - "y":102.5 - }, - { - "height":0, - "id":4, - "name":"point 1", - "point":true, - "rotation":0, - "type":"point type", - "visible":true, - "width":0, - "x":174.25, - "y":186 - }, - { - "height":27.25, - "id":7, - "name":"insert text 1", - "rotation":0, - "text": - { - "color":"#b40303", - "fontfamily":"Sans Serif", - "italic":true, - "pixelsize":17, - "strikeout":true, - "text":"Hello World", - "underline":true, - "wrap":true - }, - "type":"insert text type", - "visible":true, - "width":107.625, - "x":11.3958, - "y":48.5833 - }, - { - "gid":3221225503, - "height":53, - "id":6, - "name":"inserted tile 1", - "properties":[ - { - "name":"tile property bool", - "type":"bool", - "value":true - }], - "rotation":31, - "type":"inserted tile type", - "visible":true, - "width":47, - "x":47.25, - "y":72.5 - }, - { - "height":0, - "id":8, - "name":"polyline 1", - "polyline":[ - { - "x":0, - "y":0 - }, - { - "x":-14.3333, - "y":35.6667 - }, - { - "x":15.3333, - "y":18.3333 - }], - "rotation":0, - "type":"polyline type", - "visible":true, - "width":0, - "x":144.667, - "y":112 - }, - { - "height":0, - "id":9, - "name":"polygon 2", - "polygon":[ - { - "x":-3.25, - "y":-17.25 - }, - { - "x":-15, - "y":10.75 - }, - { - "x":20.75, - "y":4.5 - }], - "rotation":0, - "type":"polygon type", - "visible":true, - "width":0, - "x":69.8333, - "y":168.333 - }], - "offsetx":4.66667, - "offsety":-4.33333, - "opacity":0.9, - "type":"objectgroup", - "visible":true, - "x":0, - "y":0 - }], - "nextlayerid":16, - "nextobjectid":10, - "orientation":"orthogonal", - "renderorder":"right-down", - "tiledversion":"1.3.1", - "tileheight":32, - "tilesets":[ - { - "firstgid":1, - "source":"tile_set_image.json" - }], - "tilewidth":32, - "type":"map", - "version":1.2, - "width":10 -} diff --git a/tests/test_data/test_map_simple_meme.json b/tests/test_data/test_map_simple_meme.json deleted file mode 100644 index 858702a..0000000 --- a/tests/test_data/test_map_simple_meme.json +++ /dev/null @@ -1,70 +0,0 @@ -{ "compressionlevel":0, - "height":6, - "infinite":false, - "layers":[ - { - "compression":"gzip", - "data":"H4sIAAAAAAAEAw3DBRKCQAAAwDMRA7BQLMTE9v+vY3dmWyGEth279uwbOTB26MixExNTM6fOnLtwae7KtYUbt+7ce7D0aOXJsxev3rxb+\/Dpy7cfv\/782wAcvDirwAAAAA==", - "encoding":"base64", - "height":6, - "id":1, - "name":"Tile Layer 1", - "opacity":1, - "type":"tilelayer", - "visible":true, - "width":8, - "x":0, - "y":0 - }], - "nextlayerid":2, - "nextobjectid":1, - "orientation":"orthogonal", - "properties":[ - { - "name":"bool property - false", - "type":"bool", - "value":false - }, - { - "name":"bool property - true", - "type":"bool", - "value":true - }, - { - "name":"color property", - "type":"color", - "value":"#ff49fcff" - }, - { - "name":"file property", - "type":"file", - "value":"..\/..\/..\/..\/..\/..\/..\/..\/var\/log\/syslog" - }, - { - "name":"float property", - "type":"float", - "value":1.23456789 - }, - { - "name":"int property", - "type":"int", - "value":13 - }, - { - "name":"string property", - "type":"string", - "value":"Hello, World!!" - }], - "renderorder":"right-down", - "tiledversion":"1.3.1", - "tileheight":32, - "tilesets":[ - { - "firstgid":1, - "source":"tile_set_image.json" - }], - "tilewidth":32, - "type":"map", - "version":1.2, - "width":8 -} From f09abd1f48e503f1e91d8e192fe2f442cc2811b4 Mon Sep 17 00:00:00 2001 From: Benjamin Kirkbride Date: Tue, 2 Jun 2020 20:44:23 -0400 Subject: [PATCH 2/2] rf(tileset): underscore appended to attribute this is unnessesary for attributes, as it does not overwrite the built-in --- pytiled_parser/tileset.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pytiled_parser/tileset.py b/pytiled_parser/tileset.py index 15d4523..8d30e06 100644 --- a/pytiled_parser/tileset.py +++ b/pytiled_parser/tileset.py @@ -112,8 +112,8 @@ class Tile: animation: Each tile can have exactly one animation associated with it. """ - id_: int - type_: Optional[str] = None + id: int + type: Optional[str] = None terrain: Optional[TileTerrain] = None animation: Optional[List[Frame]] = None objectgroup: Optional[List[TiledObject]] = None