fix: objects bounds rounded now

Author: danila-schelkov

system/lib/objects/renderable/renderable_movie_clip.py

@@ -81,6 +81,13 @@ def calculate_bounds(self, matrix: Matrix2x3) -> Rect:
         for child in self._frame_children:
             rect.merge_bounds(child.calculate_bounds(matrix_multiplied))
 
+        rect = Rect(
+            left=round(rect.left),
+            top=round(rect.top),
+            right=round(rect.right),
+            bottom=round(rect.bottom),
+        )
+
         return rect
 
     def set_frame(self, frame_index: int):

system/lib/objects/renderable/renderable_shape.py

@@ -43,4 +43,11 @@ def calculate_bounds(self, matrix: Matrix2x3) -> Rect:
         for region in self._regions:
             rect.merge_bounds(region.calculate_bounds(matrix_multiplied))
 
+        rect = Rect(
+            left=round(rect.left),
+            top=round(rect.top),
+            right=round(rect.right),
+            bottom=round(rect.bottom),
+        )
+
         return rect

system/lib/objects/shape/region.py

@@ -59,7 +59,7 @@ def load(self, swf: SupercellSWF, tag: int):
     def render(self, matrix: Matrix2x3) -> Image.Image:
         transformed_points = apply_matrix(self._xy_points, matrix)
 
-        rect = get_rect(transformed_points)
+        rect = self.calculate_bounds(matrix)
         width, height = max(int(rect.width), 1), max(int(rect.height), 1)
 
         rendered_region = self.get_image()
@@ -135,4 +135,11 @@ def get_y(self, index: int):
         return self._xy_points[index].y
 
     def calculate_bounds(self, matrix: Matrix2x3 | None = None) -> Rect:
-        return get_rect(apply_matrix(self._xy_points, matrix))
+        rect = get_rect(apply_matrix(self._xy_points, matrix))
+        rect = Rect(
+            left=round(rect.left),
+            top=round(rect.top),
+            right=round(rect.right),
+            bottom=round(rect.bottom),
+        )
+        return rect

system/lib/pixel_utils.py

@@ -86,6 +86,15 @@ def _write_rgb5a1(pixel: PixelChannels) -> bytes:
     return struct.pack("<H", a >> 7 | b >> 3 << 1 | g >> 3 << 6 | r >> 3 << 11)
 
 
+# TODO: rewrite with numpy https://qna.habr.com/q/298153
+# rgb888 = numpy.asarray(Image.open(filename))
+# # check that image have 3 color components, each of 8 bits
+# assert rgb888.shape[-1] == 3 and rgb888.dtype == numpy.uint8
+# r5 = (rgb888[..., 0] >> 3 & 0x1f).astype(numpy.uint16)
+# g6 = (rgb888[..., 1] >> 2 & 0x3f).astype(numpy.uint16)
+# b5 = (rgb888[..., 2] >> 3 & 0x1f).astype(numpy.uint16)
+# rgb565 = r5 << 11 | g6 << 5 | b5
+# return rgb565.tobytes()
 def _write_rgb565(pixel: PixelChannels) -> bytes:
     r, g, b = pixel
     return struct.pack("<H", b >> 3 | g >> 2 << 5 | r >> 3 << 11)