fix: placing sprites

Author: danila-schelkov

system/lib/features/cut_sprites.py

@@ -60,7 +60,7 @@ def render_objects(swf: SupercellSWF, output_folder: Path):
         for region_index in range(regions_count):
             region = shape.regions[region_index]
 
-            rendered_region = region.render(use_original_size=True)
+            rendered_region = region.get_image()
             rendered_region.save(f"{output_folder}/shape_{shape.id}_{region_index}.png")
 
     for shape_index in range(shapes_count):
@@ -78,5 +78,3 @@ def render_objects(swf: SupercellSWF, output_folder: Path):
             for i in range(region.get_point_count()):
                 swf.xcod_writer.write_uint16(int(region.get_u(i)))
                 swf.xcod_writer.write_uint16(int(region.get_v(i)))
-            swf.xcod_writer.write_ubyte(1 if region.is_mirrored else 0)
-            swf.xcod_writer.write_byte(region.rotation // 90)

system/lib/features/place_sprites.py

@@ -52,40 +52,40 @@ def place_sprites(
                 "L", texture_width, texture_height, region_info.points, MASK_COLOR
             )
 
-            if rect.width + rect.height <= 2:
+            if rect.width == 0 or rect.height == 0:
                 if rect.height != 0:
                     for _y in range(int(rect.height)):
                         img_mask.putpixel(
                             (int(rect.right - 1), int(rect.top + _y - 1)), MASK_COLOR
                         )
+                    rect.right += 1
                 elif rect.width != 0:
                     for _x in range(int(rect.width)):
                         img_mask.putpixel(
                             (int(rect.left + _x - 1), int(rect.bottom - 1)), MASK_COLOR
                         )
+                    rect.bottom += 1
                 else:
                     img_mask.putpixel(
                         (int(rect.right - 1), int(rect.bottom - 1)), MASK_COLOR
                     )
+                    rect.right += 1
+                    rect.bottom += 1
 
             x = int(rect.left)
             y = int(rect.top)
             width = int(rect.width)
             height = int(rect.height)
             bbox = int(rect.left), int(rect.top), int(rect.right), int(rect.bottom)
 
-            tmp_region = Image.open(
+            region_image = Image.open(
                 f'{folder}{"/overwrite" if overwrite else ""}/{filename}'
             ).convert("RGBA")
-            if region_info.is_mirrored:
-                tmp_region = tmp_region.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
-            tmp_region = tmp_region.rotate(region_info.rotation, expand=True)
-            tmp_region = tmp_region.resize((width, height), Image.Resampling.LANCZOS)
 
             sheets[region_info.texture_id].paste(
                 Image.new("RGBA", (width, height)), (x, y), img_mask.crop(bbox)
             )
-            sheets[region_info.texture_id].paste(tmp_region, (x, y), tmp_region)
+            sheets[region_info.texture_id].paste(region_image, (x, y), region_image)
     print()
 
     return sheets

system/lib/math/polygon.py

@@ -25,7 +25,7 @@ def is_clockwise(polygon: Polygon) -> bool:
 def compare_polygons(
     polygon1: Polygon,
     polygon2: Polygon,
-) -> tuple[int, bool]:
+) -> tuple[float, bool]:
     """Calculates rotation and if polygon is mirrored.
 
     :param polygon1: shape polygon
@@ -48,7 +48,7 @@ def compare_polygons(
 
     angle = (angle_xy - angle_uv) % 360
 
-    return int(angle), mirroring
+    return angle, mirroring
 
 
 def get_rect(polygon: list[Point]) -> Rect:

system/lib/objects/shape/region.py

@@ -17,9 +17,7 @@
 
 class Region:
     def __init__(self):
-        self.texture_index = 0
-        self.rotation = 0
-        self.is_mirrored = False
+        self.texture_index: int = 0
 
         self._point_count = 0
         self._xy_points: list[Point] = []
@@ -52,17 +50,13 @@ def load(self, swf: SupercellSWF, tag: int):
 
             self._uv_points[i] = Point(u, v)
 
-    def render(
-        self, matrix: Matrix2x3 | None = None, use_original_size: bool = False
-    ) -> Image.Image:
+    def render(self, matrix: Matrix2x3 | None = None) -> Image.Image:
         transformed_points = self.apply_matrix(matrix)
 
         rect = get_rect(transformed_points)
         width, height = max(int(rect.width), 1), max(int(rect.height), 1)
 
-        self.rotation, self.is_mirrored = compare_polygons(
-            transformed_points, self._uv_points
-        )
+        rotation, is_mirrored = compare_polygons(transformed_points, self._uv_points)
 
         rendered_region = self.get_image()
         if rendered_region.width + rendered_region.height <= 2:
@@ -72,12 +66,9 @@ def render(
                 rendered_region.mode, width, height, transformed_points, fill_color
             )
 
-        if self.is_mirrored:
+        if is_mirrored:
             rendered_region = rendered_region.transpose(Image.Transpose.FLIP_LEFT_RIGHT)
-        rendered_region = rendered_region.rotate(-self.rotation, expand=True)
-
-        if use_original_size:
-            return rendered_region
+        rendered_region = rendered_region.rotate(-rotation, expand=True)
 
         return rendered_region.resize((width, height), Image.Resampling.LANCZOS)
 

system/lib/xcod.py

@@ -30,8 +30,6 @@ def height(self) -> int:
 class RegionInfo:
     texture_id: int
     points: list[Point]
-    is_mirrored: bool
-    rotation: int
 
 
 @dataclass
@@ -95,9 +93,7 @@ def parse_detailed_info(file_info: FileInfo, reader: Reader) -> None:
                 for _ in range(points_count)
             ]
 
-            is_mirrored, rotation = reader.read_uchar() == 1, reader.read_char() * 90
-
-            regions.append(RegionInfo(texture_id, points, is_mirrored, rotation))
+            regions.append(RegionInfo(texture_id, points))
 
         file_info.shapes.append(ShapeInfo(shape_id, regions))