1 files changed, 22 insertions, 23 deletions

diff --git a/tools/mkasset.py b/tools/mkasset.py
index 9b9dc76..a402e3c 100644
--- a/tools/mkasset.py
+++ b/tools/mkasset.py
@@ -13,6 +13,7 @@
 import argparse
 import ctypes
 import sys
+from enum import IntEnum
 from typing import Generator
 from xml.etree import ElementTree
 
@@ -23,6 +24,12 @@ from PIL import Image
 MAX_PATH_LENGTH = 128
 
 
+class Orientation(IntEnum):
+    """Map orientation. Must match Tm_Orientation in asset.h"""
+    Orthogonal = 0
+    Isometric = 1
+
+
 def drop_extension(filepath):
     return filepath[:filepath.rfind('.')]
 
@@ -51,23 +58,21 @@ def carve_image(rgba_bytes, tile_width, tile_height, columns) -> Generator[bytea
     image_width = columns * tile_width
     image_height = len(rgba_bytes) // image_width // 4
 
-    tiles_x = image_width // tile_width
-    tiles_y = image_height // tile_height
-
     tile_bytes = bytearray(tile_width * tile_height * 4)
-    for i in range(tiles_y):
-        image_y0 = i * tile_height  # y-origin of tile inside image
-        for j in range(tiles_x):
-            image_x0 = j * tile_width  # x-origin of tile inside image
+    for image_y0 in range(0, image_height, tile_height):  # y-origin of tile inside image
+        for image_x0 in range(0, image_width, tile_width):  # x-origin of tile inside image
             for y in range(tile_height):
                 image_y = image_y0 + y  # y of current pixel inside image
                 for x in range(tile_width):
                     image_x = image_x0 + x  # x of current pixel inside image
-                    tile_bytes[(y * tile_width + x) * 4] = (
-                        rgba_bytes)[(image_y * image_width + image_x) * 4]
+                    for c in range(4):
+                        tile_bytes[((y * tile_width + x) * 4) + c] = (
+                            rgba_bytes)[((image_y * image_width + image_x) * 4) + c]
             yield tile_bytes.copy()
 
 
+# TODO: Palettize it like we do for sprites. Use 2-byte indices to allow up to
+#  65k colours.
 def convert_tsx(input_filepath, output_filepath):
     """Converts a Tiled .tsx tileset file to a .TS tile set file."""
     xml = ElementTree.parse(input_filepath)
@@ -183,11 +188,13 @@ def convert_tmx(input_filepath, output_filepath):
     base_tile_width = int(root.attrib["tilewidth"])
     base_tile_height = int(root.attrib["tileheight"])
     num_layers = 1
+    flags = Orientation.Isometric if (root.attrib["orientation"] == "isometric") else Orientation.Orthogonal
 
     print(f"Map width:   {map_width}")
     print(f"Map height:  {map_height}")
     print(f"Tile width:  {base_tile_width}")
     print(f"Tile height: {base_tile_height}")
+    print(f"Orientation: {flags}")
 
     tileset_path = None
 
@@ -210,6 +217,7 @@ def convert_tmx(input_filepath, output_filepath):
                 output.write(ctypes.c_uint16(base_tile_width))
                 output.write(ctypes.c_uint16(base_tile_height))
                 output.write(ctypes.c_uint16(num_layers))
+                output.write(ctypes.c_uint16(flags))
             elif child.tag == "layer":
                 layer = child
                 layer_id = int(layer.attrib["id"])
@@ -349,25 +357,16 @@ def convert_sprite_sheet(input_file_paths, sprite_width, sprite_height,
         # that. getcolors() returns the number of unique colors.
         # getpalette() also returns a flattened list, which is why we must *4.
         num_colours = len(im.getcolors())
-        colours = im.getpalette(rawmode="RGBA")[:4 * num_colours]
-        # TODO: This palette list does not seem really necessary.
-        #  Define palette = bytearray(im.getpalette(...))
-        palette = []
-        for i in range(0, 4 * num_colours, 4):
-            palette.append((colours[i], colours[i + 1], colours[i + 2],
-                            colours[i + 3]))
+        palette = bytearray(im.getpalette(rawmode="RGBA")[:4 * num_colours])
+        assert (num_colours == (len(palette) // 4))
 
-        output.write(ctypes.c_uint16(len(palette)))
-        output.write(bytearray(colours))
+        output.write(ctypes.c_uint16(num_colours))
+        output.write(palette)
 
         print(f"Sprite width:  {sprite_width}")
         print(f"Sprite height: {sprite_height}")
         print(f"Rows:          {len(rows)}")
-        print(f"Colours:       {len(palette)}")
-
-        # print("Palette")
-        # for i, colour in enumerate(palette):
-        #     print(f"{i}: {colour}")
+        print(f"Colours:       {num_colours}")
 
         for row, num_columns in enumerate(rows):
             output.write(ctypes.c_uint16(num_columns))