feat(rendering): rendering shape regions with original size

Author: danila-schelkov

system/lib/console.py

@@ -21,9 +21,10 @@ def ask_integer(message: str):
 
     @staticmethod
     def question(message):
-        answer = None
-        while not answer in 'ny':
+        while True:
             answer = input(f'[????] {message} [Y/n] ').lower()
+            if answer in 'ny':
+                break
 
         return 'ny'.index(answer)
 

system/lib/features/cut_sprites.py

@@ -50,8 +50,7 @@ def cut_sprites(swf: SupercellSWF, export_folder: str):
         for region_index in range(regions_count):
             region = shape.regions[region_index]
 
-            region.apply_matrix(None)
-            rendered_region = region.render()
+            rendered_region = region.render(use_original_size=True)
             rendered_region.save(f'{export_folder}/shape_{shape.id}_{region_index}.png')
 
     for shape_index in range(shapes_count):

system/lib/features/place_sprites.py

@@ -3,6 +3,7 @@
 from PIL import Image, ImageDraw
 
 from system.lib import Console
+from system.lib.helper import get_sides, get_size
 from system.lib.images import get_format_by_pixel_type
 from system.lib.xcod import parse_info, FileInfo
 from system.localization import locale
@@ -33,27 +34,23 @@ def place_sprites(xcod_path: str, folder: str, overwrite: bool = False) -> (list
         for region_index in range(regions_count):
             texture_id, points_count = xcod.read_uchar(), xcod.read_uchar()
             texture_width, texture_height = sheets[texture_id].width, sheets[texture_id].height
-            polygon = [(xcod.read_ushort(), xcod.read_ushort()) for _ in range(points_count)]
+            points = [(xcod.read_ushort(), xcod.read_ushort()) for _ in range(points_count)]
             mirroring, rotation = xcod.read_uchar() == 1, xcod.read_char() * 90
 
             filename = f'shape_{shape_id}_{region_index}.png'
             if filename not in files_to_overwrite:
                 continue
 
-            tmp_region = Image.open(
-                f'{folder}{"/overwrite" if overwrite else ""}/{filename}'
-            ).convert('RGBA').rotate(-rotation, expand=True)
-
             img_mask = Image.new('L', (texture_width, texture_height), 0)
             color = 255
-            ImageDraw.Draw(img_mask).polygon(polygon, fill=color)
+            ImageDraw.Draw(img_mask).polygon(points, fill=color)
             bbox = img_mask.getbbox()
 
             if not bbox:
-                min_x = min(i[0] for i in polygon)
-                min_y = min(i[1] for i in polygon)
-                max_x = max(i[0] for i in polygon)
-                max_y = max(i[1] for i in polygon)
+                min_x = min(i[0] for i in points)
+                min_y = min(i[1] for i in points)
+                max_x = max(i[0] for i in points)
+                max_y = max(i[1] for i in points)
 
                 if max_y - min_y != 0:
                     for _y in range(max_y - min_y):
@@ -64,25 +61,26 @@ def place_sprites(xcod_path: str, folder: str, overwrite: bool = False) -> (list
                         img_mask.putpixel((min_x + _x - 1, max_y - 1), color)
                 else:
                     img_mask.putpixel((max_x - 1, max_y - 1), color)
-                bbox = img_mask.getbbox()
 
-            left, top, right, bottom = bbox
-            if right - left - 1:
-                right -= 1
-            if bottom - top - 1:
-                bottom -= 1
+            left, top, right, bottom = get_sides(points)
+            if left == right:
+                right += 1
+            if top == bottom:
+                bottom += 1
 
-            bbox = left, top, right, bottom
+            width, height = get_size(left, top, right, bottom)
 
-            width = right - left
-            height = bottom - top
-            region_size = width, height
-            tmp_region = tmp_region.resize(region_size, Image.ANTIALIAS)
+            bbox = left, top, right, bottom
 
+            tmp_region = Image.open(
+                f'{folder}{"/overwrite" if overwrite else ""}/{filename}'
+            ).convert('RGBA')
             if mirroring:
                 tmp_region = tmp_region.transpose(Image.FLIP_LEFT_RIGHT)
+            tmp_region = tmp_region.rotate(rotation, expand=True)
+            tmp_region = tmp_region.resize((width, height), Image.ANTIALIAS)
 
-            sheets[texture_id].paste(Image.new('RGBA', region_size), (left, top), img_mask.crop(bbox))
+            sheets[texture_id].paste(Image.new('RGBA', (width, height)), (left, top), img_mask.crop(bbox))
             sheets[texture_id].paste(tmp_region, (left, top), tmp_region)
     print()
 

system/lib/objects/shape.py

@@ -1,5 +1,5 @@
 from math import ceil, degrees, atan2
-from typing import List, Tuple
+from typing import List, Tuple, Optional
 
 from PIL import Image, ImageDraw
 
@@ -125,8 +125,8 @@ def load(self, swf, tag: int):
 
             self._uv_points[i].position = (u_rounded, v_rounded)
 
-    def render(self):
-        self._transformed_points = self._xy_points
+    def render(self, use_original_size: bool = False) -> Image.Image:
+        self.apply_matrix(None)
 
         left, top, right, bottom = self.get_sides()
         width, height = get_size(left, top, right, bottom)
@@ -150,8 +150,9 @@ def render(self):
         rendered_region = rendered_region.rotate(-self.rotation, expand=True)
         if self.is_mirrored:
             rendered_region = rendered_region.transpose(Image.FLIP_LEFT_RIGHT)
-        rendered_region = rendered_region.resize((width, height), Image.ANTIALIAS)
-        return rendered_region
+        if use_original_size:
+            return rendered_region
+        return rendered_region.resize((width, height), Image.ANTIALIAS)
 
     def get_image(self) -> Image:
         left, top, right, bottom = get_sides(self._uv_points)
@@ -205,7 +206,7 @@ def get_position(self) -> Tuple[float, float]:
     def get_sides(self) -> Tuple[float, float, float, float]:
         return get_sides(self._transformed_points)
 
-    def apply_matrix(self, matrix: Matrix2x3 = None) -> None:
+    def apply_matrix(self, matrix: Optional[Matrix2x3] = None) -> None:
         """Applies affine matrix to shape (xy) points. If matrix is none, copies the points.
 
         :param matrix: Affine matrix
@@ -220,7 +221,9 @@ def apply_matrix(self, matrix: Matrix2x3 = None) -> None:
                     matrix.apply_y(point.x, point.y)
                 ))
 
-    def calculate_rotation(self, round_to_nearest: bool = False, custom_points: List[Point] = None) -> (int, bool):
+    def calculate_rotation(self,
+                           round_to_nearest: bool = False,
+                           custom_points: List[Point] = None) -> (int, bool):
         """Calculates rotation and if region is mirrored.
 
         :param round_to_nearest: should round to a multiple of 90