Skip to content

Tilemap layer names #105

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
Daft-Freak wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Tilemap layer names #105

Show file tree
Hide file tree
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 src/tests/test_map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def test_map_tiled_struct_8bit():
</map>
''', 'tiled', output_struct=True)
# Tile indexes 1, 2, 3, 4 will be remapped -1 to 0, 1, 2, 3
assert output == struct.pack('<4sHHHHHH4B', b'MTMX', 16, 0, 0, 4, 1, 1, 0, 1, 2, 3)
assert output == struct.pack('<4sHHHHHH4B13s', b'MTMX', 16, 4, 0, 4, 1, 1, 0, 1, 2, 3, b'Tile Layer 1\0')


def test_map_tiled_struct_16bit():
Expand All @@ -47,7 +47,7 @@ def test_map_tiled_struct_16bit():
''', 'tiled', output_struct=True)
# Tile indexes 256, 257, 258, 259 will be remapped -1 to 255, 256, 257, 258
# output tile data will be 16bit!
assert output == struct.pack('<4sHHHHHH4H', b'MTMX', 16, 1, 0, 4, 1, 1, 255, 256, 257, 258)
assert output == struct.pack('<4sHHHHHH4H13s', b'MTMX', 16, 5, 0, 4, 1, 1, 255, 256, 257, 258, b'Tile Layer 1\0')


def test_map_tiled_layer_reorder():
Expand All @@ -67,7 +67,7 @@ def test_map_tiled_layer_reorder():
</layer>
</map>
''', 'tiled', output_struct=True)
assert output == struct.pack('<4sHHHHHH8B', b'MTMX', 16, 0, 0, 4, 1, 2, 0, 1, 2, 3, 4, 5, 6, 7)
assert output == struct.pack('<4sHHHHHH8B26s', b'MTMX', 16, 4, 0, 4, 1, 2, 0, 1, 2, 3, 4, 5, 6, 7, b'Tile Layer 1\0Tile Layer 2\0')


def test_map_empty_tiled_remap_empty():
Expand Down
9 changes: 8 additions & 1 deletion src/ttblit/asset/builders/map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ def tiled_to_binary(data, empty_tile, output_struct):
layers = root.findall('layer')
layer_data = []
transform_data = []
layer_names = []
# Sort layers by ID (since .tmx files can have them in arbitrary orders)
layers.sort(key=lambda l: int(l.get('id')))

Expand All @@ -43,6 +44,8 @@ def tiled_to_binary(data, empty_tile, output_struct):
layer_data += layer
transform_data += layer_transforms

layer_names.append(layer_csv.attrib['name'])

if use_16bits:
layer_data = struct.pack(f'<{len(layer_data)}H', *layer_data)
else:
Expand All @@ -65,6 +68,10 @@ def tiled_to_binary(data, empty_tile, output_struct):
else:
transform_data = []

# append layer names at the very end
name_data = b'\0'.join([x.encode() for x in layer_names]) + b'\0'
flags |= (1 << 2) # have names

return struct.pack(
'<4sHHHHHH',
bytes('MTMX', encoding='utf-8'),
Expand All @@ -74,7 +81,7 @@ def tiled_to_binary(data, empty_tile, output_struct):
width,
height,
layer_count
) + layer_data + bytes(transform_data)
) + layer_data + bytes(transform_data) + name_data

else:
# Just return the raw layer data
Expand Down