A new method for calculating rotation of regions

Author: danila-schelkov

main.py

@@ -1,21 +1,19 @@
 # Refactored by Vorono4ka
 # Finished ~99%
-# Translated by yura331.com
 
 import time
 
 try:
     from loguru import logger
 except ImportError:
-    print('Please, install loguru using pip')
-    exit()
+    raise RuntimeError('Please, install loguru using pip')
 
 from system import clear
-from system.lib import config, Console, locale, refill_menu, menu
+from system.lib import config, locale, refill_menu, menu
 from system.lib.features.initialization import initialize
 
 
-if __name__ == '__main__':
+def main():
     if not config.initialized:
         config.change_language(locale.change())
 
@@ -26,16 +24,19 @@
     refill_menu()
 
     while True:
-        try:
-            handler = menu.choice()
-            if handler is not None:
-                start_time = time.time()
-                with logger.catch():
-                    handler()
-                logger.opt(colors=True).info(f'<green>{locale.done % (time.time() - start_time)}</green>')
-                input(locale.to_continue)
-            clear()
-        except KeyboardInterrupt:
-            if Console.question(locale.want_exit):
-                clear()
-                break
+        handler = menu.choice()
+        if handler is not None:
+            start_time = time.time()
+            with logger.catch():
+                handler()
+            logger.opt(colors=True).info(f'<green>{locale.done % (time.time() - start_time)}</green>')
+            input(locale.to_continue)
+        clear()
+
+
+if __name__ == '__main__':
+    try:
+        main()
+    except KeyboardInterrupt:
+        logger.info('Exit.')
+        pass

system/languages/en-EU.json

@@ -73,7 +73,6 @@
     "cut_sprites_process": "Cutting sprites... (%d/%d)",
     "place_sprites_process": "Placing sprites... (%d/%d)",
     "not_implemented": "This feature will be added in future updates.\nYou can follow XCoder updates here: github.com/Vorono4ka/XCoder",
-    "want_exit": "Want to exit?",
     "dec_sc": "Decoding .sc file...",
     "error": "ERROR! (%s.%s: %s)",
     "e1sc1": "Overwrite SC sprites",

system/languages/ru-RU.json

@@ -73,7 +73,6 @@
     "cut_sprites_process": "Вырезаем спрайты... (%d/%d)",
     "place_sprites_process": "Ставим спрайты на место... (%d/%d)",
     "not_implemented": "Данная возможность будет добавлена в будущих обновлениях.\nЗа обновлениями XCoder вы можете следить здесь: github.com/Vorono4ka/XCoder",
-    "want_exit": "Хотите выйти?",
     "dec_sc": "Декодируем SC...",
     "error": "ОШИБКА! (%s.%s: %s)",
     "e1sc1": "Перезапись спрайтов",

system/languages/ua-UA.json

@@ -73,7 +73,6 @@
     "cut_sprites_process": "Обрізаємо спрайти... (%d/%d)",
     "place_sprites_process": "Вставляємо спрайти... (%d/%d)",
     "not_implemented": "Ця функція буде додана у наступних оновленнях.\nТи можеш сладкувати за оновленнями тут: github.com/Vorono4ka/XCoder",
-    "want_exit": "Справді хочете вийти?",
     "dec_sc": "Розпаковуємо .sc файл...",
     "error": "Помилка! (%s.%s: %s)",
     "e1sc1": "Переписати SC спрайти",

system/lib/config.py

@@ -3,6 +3,8 @@
 
 
 class Config:
+    DEFAULT_LANGUAGE = 'en-EU'
+
     config_path = './system/config.json'
     inited: bool
 
@@ -18,7 +20,7 @@ def __init__(self):
 
         self.initialized: bool = False
         self.version = None
-        self.language: str = 'en-EU'
+        self.language: str = Config.DEFAULT_LANGUAGE
         self.has_update: bool = False
         self.last_update: int = -1
         self.auto_update: bool = False

system/lib/features/cut_sprites.py

@@ -30,14 +30,14 @@ def cut_sprites(swf: SupercellSWF, export_folder: str):
         for region_index in range(regions_count):
             region = shape.regions[region_index]
 
-            swf.xcod_writer.write_ubyte(region.texture_id)
-            swf.xcod_writer.write_ubyte(region.points_count)
-
-            for point in region.sheet_points:
-                swf.xcod_writer.write_uint16(int(point.x))
-                swf.xcod_writer.write_uint16(int(point.y))
-            swf.xcod_writer.write_ubyte(1 if region.mirroring else 0)
-            swf.xcod_writer.write_ubyte(region.rotation // 90)
+            swf.xcod_writer.write_ubyte(region.texture_index)
+            swf.xcod_writer.write_ubyte(region.get_points_count())
+
+            for i in range(region.get_points_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)
 
             rendered_region = region.render(swf)
             rendered_region.save(f'{export_folder}/shape_{shape.id}_{region_index}.png')

system/lib/features/place_sprites.py

@@ -34,15 +34,15 @@ def place_sprites(xcod_path: str, folder: str, overwrite: bool = False) -> (list
             texture_id, points_count = xcod.read_ubyte(), xcod.read_ubyte()
             texture_width, texture_height = sheets[texture_id].width, sheets[texture_id].height
             polygon = [(xcod.read_uint16(), xcod.read_uint16()) for _ in range(points_count)]
-            mirroring, rotation = xcod.read_ubyte() == 1, xcod.read_ubyte() * 90
+            mirroring, rotation = xcod.read_ubyte() == 1, xcod.read_byte() * 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(360 - rotation, expand=True)
+            ).convert('RGBA').rotate(-rotation, expand=True)
 
             img_mask = Image.new('L', (texture_width, texture_height), 0)
             color = 255
@@ -80,8 +80,7 @@ def place_sprites(xcod_path: str, folder: str, overwrite: bool = False) -> (list
             tmp_region = tmp_region.resize(region_size, Image.ANTIALIAS)
 
             if mirroring:
-                tmp_region = tmp_region.transform(region_size, Image.EXTENT,
-                                                  (tmp_region.width, 0, 0, tmp_region.height))
+                tmp_region = tmp_region.transpose(Image.FLIP_LEFT_RIGHT)
 
             sheets[texture_id].paste(Image.new('RGBA', region_size), (left, top), img_mask.crop(bbox))
             sheets[texture_id].paste(tmp_region, (left, top), tmp_region)

system/lib/features/sc/assembly_encode.py

@@ -24,4 +24,4 @@ def sc1_encode(overwrite: bool = False):
                 compile_sc(f'{folder}{file}/', file_info, sheets, output_folder)
             except Exception as exception:
                 logger.exception(locale.error % (exception.__class__.__module__, exception.__class__.__name__, exception))
-            print()
+        print()

system/lib/features/sc/decode_and_cut.py

@@ -29,28 +29,27 @@ def sc1_decode():
                 logger.error(locale.not_found % (base_name + '_tex.sc'))
                 continue
 
-            current_sub_path = os.path.basename(swf.filename).rsplit('.', 1)[0]
-            if os.path.isdir(f'{output_folder}/{current_sub_path}'):
-                shutil.rmtree(f'{output_folder}/{current_sub_path}')
-            os.mkdir(f'{output_folder}/{current_sub_path}')
-            os.makedirs(f"{output_folder}/{current_sub_path}/textures", exist_ok=True)
-            base_name = os.path.basename(file).rsplit('.', 1)[0]
+            base_name = os.path.basename(swf.filename).rsplit('.', 1)[0]
+            if os.path.isdir(f'{output_folder}/{base_name}'):
+                shutil.rmtree(f'{output_folder}/{base_name}')
+            os.mkdir(f'{output_folder}/{base_name}')
+            os.makedirs(f"{output_folder}/{base_name}/textures", exist_ok=True)
 
-            with open(f'{output_folder}/{current_sub_path}/{base_name}.xcod', 'wb') as xcod_file:
+            with open(f'{output_folder}/{base_name}/{base_name}.xcod', 'wb') as xcod_file:
                 xcod_file.write(b'XCOD' + bool.to_bytes(use_lzham, 1, 'big') +
                                 int.to_bytes(len(swf.textures), 1, 'big'))
 
                 for img_index in range(len(swf.textures)):
                     filename = base_name + '_' * img_index
                     swf.textures[img_index].image.save(
-                        f'{output_folder}/{current_sub_path}/textures/{filename}.png'
+                        f'{output_folder}/{base_name}/textures/{filename}.png'
                     )
 
                 logger.info(locale.dec_sc)
 
                 cut_sprites(
                     swf,
-                    f'{output_folder}/{current_sub_path}'
+                    f'{output_folder}/{base_name}'
                 )
                 xcod_file.write(swf.xcod_writer.getvalue())
         except Exception as exception:

system/lib/images.py

@@ -152,7 +152,6 @@ def read_pixel():
             if curr > point:
                 Console.progress_bar(locale.crt_pic, y, height)
                 point = curr
-    print()
 
 
 def save_texture(sc, img, _type):