ReverseBox 0.26.0__tar.gz → 0.26.2__tar.gz

{reversebox-0.26.0 → reversebox-0.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ReverseBox
-Version: 0.26.0
+Version: 0.26.2
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda
@@ -169,37 +169,12 @@ or software researchers).
   - Decode/Encode BGRA8888 ✔️
   - Decode RGB48 ✔️
   - Decode BGR48 ✔️
-  - Decode PAL4_RGBX5551 ✔️
-  - Decode PAL4_BGRX5551 ✔️
-  - Decode PAL4_XRGB1555 ✔️
-  - Decode PAL4_XBGR1555 ✔️
-  - Decode PAL4_RGB888 ✔️
-  - Decode PAL4_BGR888 ✔️
-  - Decode PAL4_IA8 ✔️
-  - Decode PAL4_RGB565 ✔️
-  - Decode PAL4_RGB5A3 ✔️
-  - Decode PAL4_RGBA8888 ✔️
-  - Decode PAL4_BGRA8888 ✔️
-  - Decode PAL4_RGB5A3 ✔️
-  - Decode PAL8_RGBX2222 ✔️
-  - Decode PAL8_RGBX5551 ✔️
-  - Decode PAL8_BGRX5551 ✔️
-  - Decode PAL8_XRGB1555 ✔️
-  - Decode PAL8_XBGR1555 ✔️
-  - Decode PAL8_RGB888 ✔️
-  - Decode PAL8_BGR888 ✔️
-  - Decode PAL8_RGBX6666 ✔️
-  - Decode PAL8_IA8 ✔️
-  - Decode PAL8_RGB565 ✔️
-  - Decode PAL8_RGB5A3 ✔️
-  - Decode PAL8_RGBA8888 ✔️
-  - Decode PAL8_BGRA8888 ✔️
-  - Decode PAL16_IA8 ✔️
-  - Decode PAL16_RGB565 ✔️
-  - Decode PAL16_RGB5A3 ✔️
-  - Decode PAL16_RGBA8888 ✔️
-  - Decode N64_RGB5A3 ✔️
+  - Decode PAL4 ✔️
+  - Decode PAL8 ✔️
+  - Decode PAL16 ✔️
+  - Decode PAL32 ✔️
   - Decode PAL_I8A8 ✔️
+  - Decode N64_RGB5A3 ✔️
   - Decode N64_I4 ✔️
   - Decode N64_I8 ✔️
   - Decode N64_IA4 ✔️

{reversebox-0.26.0 → reversebox-0.26.2}/README.md

@@ -132,37 +132,12 @@ or software researchers).
   - Decode/Encode BGRA8888 ✔️
   - Decode RGB48 ✔️
   - Decode BGR48 ✔️
-  - Decode PAL4_RGBX5551 ✔️
-  - Decode PAL4_BGRX5551 ✔️
-  - Decode PAL4_XRGB1555 ✔️
-  - Decode PAL4_XBGR1555 ✔️
-  - Decode PAL4_RGB888 ✔️
-  - Decode PAL4_BGR888 ✔️
-  - Decode PAL4_IA8 ✔️
-  - Decode PAL4_RGB565 ✔️
-  - Decode PAL4_RGB5A3 ✔️
-  - Decode PAL4_RGBA8888 ✔️
-  - Decode PAL4_BGRA8888 ✔️
-  - Decode PAL4_RGB5A3 ✔️
-  - Decode PAL8_RGBX2222 ✔️
-  - Decode PAL8_RGBX5551 ✔️
-  - Decode PAL8_BGRX5551 ✔️
-  - Decode PAL8_XRGB1555 ✔️
-  - Decode PAL8_XBGR1555 ✔️
-  - Decode PAL8_RGB888 ✔️
-  - Decode PAL8_BGR888 ✔️
-  - Decode PAL8_RGBX6666 ✔️
-  - Decode PAL8_IA8 ✔️
-  - Decode PAL8_RGB565 ✔️
-  - Decode PAL8_RGB5A3 ✔️
-  - Decode PAL8_RGBA8888 ✔️
-  - Decode PAL8_BGRA8888 ✔️
-  - Decode PAL16_IA8 ✔️
-  - Decode PAL16_RGB565 ✔️
-  - Decode PAL16_RGB5A3 ✔️
-  - Decode PAL16_RGBA8888 ✔️
-  - Decode N64_RGB5A3 ✔️
+  - Decode PAL4 ✔️
+  - Decode PAL8 ✔️
+  - Decode PAL16 ✔️
+  - Decode PAL32 ✔️
   - Decode PAL_I8A8 ✔️
+  - Decode N64_RGB5A3 ✔️
   - Decode N64_I4 ✔️
   - Decode N64_I8 ✔️
   - Decode N64_IA4 ✔️

{reversebox-0.26.0 → reversebox-0.26.2}/ReverseBox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ReverseBox
-Version: 0.26.0
+Version: 0.26.2
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda
@@ -169,37 +169,12 @@ or software researchers).
   - Decode/Encode BGRA8888 ✔️
   - Decode RGB48 ✔️
   - Decode BGR48 ✔️
-  - Decode PAL4_RGBX5551 ✔️
-  - Decode PAL4_BGRX5551 ✔️
-  - Decode PAL4_XRGB1555 ✔️
-  - Decode PAL4_XBGR1555 ✔️
-  - Decode PAL4_RGB888 ✔️
-  - Decode PAL4_BGR888 ✔️
-  - Decode PAL4_IA8 ✔️
-  - Decode PAL4_RGB565 ✔️
-  - Decode PAL4_RGB5A3 ✔️
-  - Decode PAL4_RGBA8888 ✔️
-  - Decode PAL4_BGRA8888 ✔️
-  - Decode PAL4_RGB5A3 ✔️
-  - Decode PAL8_RGBX2222 ✔️
-  - Decode PAL8_RGBX5551 ✔️
-  - Decode PAL8_BGRX5551 ✔️
-  - Decode PAL8_XRGB1555 ✔️
-  - Decode PAL8_XBGR1555 ✔️
-  - Decode PAL8_RGB888 ✔️
-  - Decode PAL8_BGR888 ✔️
-  - Decode PAL8_RGBX6666 ✔️
-  - Decode PAL8_IA8 ✔️
-  - Decode PAL8_RGB565 ✔️
-  - Decode PAL8_RGB5A3 ✔️
-  - Decode PAL8_RGBA8888 ✔️
-  - Decode PAL8_BGRA8888 ✔️
-  - Decode PAL16_IA8 ✔️
-  - Decode PAL16_RGB565 ✔️
-  - Decode PAL16_RGB5A3 ✔️
-  - Decode PAL16_RGBA8888 ✔️
-  - Decode N64_RGB5A3 ✔️
+  - Decode PAL4 ✔️
+  - Decode PAL8 ✔️
+  - Decode PAL16 ✔️
+  - Decode PAL32 ✔️
   - Decode PAL_I8A8 ✔️
+  - Decode N64_RGB5A3 ✔️
   - Decode N64_I4 ✔️
   - Decode N64_I8 ✔️
   - Decode N64_IA4 ✔️

{reversebox-0.26.0 → reversebox-0.26.2}/reversebox/image/common.py

@@ -83,7 +83,8 @@ def get_bpp_for_image_format(image_format: ImageFormats) -> int:
                         ImageFormats.N64_I4,
                         ImageFormats.BC1_DXT1,
                         ImageFormats.BC4_UNORM,
-                        ) or "pal4" in image_format.value.lower():
+                        ImageFormats.PAL4,
+                        ):
         return 4
     elif image_format in (ImageFormats.RGBX2222,
                           ImageFormats.RGBA2222,
@@ -110,7 +111,8 @@ def get_bpp_for_image_format(image_format: ImageFormats) -> int:
                           ImageFormats.GST222,
                           ImageFormats.GST422,
                           ImageFormats.GST822,
-                          ) or "pal8" in image_format.value.lower():
+                          ImageFormats.PAL8,
+                          ):
         return 8
     elif image_format in (ImageFormats.YUV410P, ):
         return 9
@@ -152,8 +154,9 @@ def get_bpp_for_image_format(image_format: ImageFormats) -> int:
                           ImageFormats.YUV422_YUY2,
                           ImageFormats.YUV440P,
                           ImageFormats.BUMPMAP_SR,
-                          ) or "pal16" in image_format.value.lower()\
-            or "pal_i8a8" in image_format.value.lower():
+                          ImageFormats.PAL16,
+                          ImageFormats.PAL_I8A8,
+                          ):
         return 16
     elif image_format in (ImageFormats.YUVA420P, ):
         return 20
@@ -175,6 +178,7 @@ def get_bpp_for_image_format(image_format: ImageFormats) -> int:
                           ImageFormats.B32,
                           ImageFormats.RGBM8888,
                           ImageFormats.AYUV,
+                          ImageFormats.PAL32,
                           ):
         return 32
     elif image_format in (ImageFormats.RGB48,

{reversebox-0.26.0 → reversebox-0.26.2}/reversebox/image/image_decoder.py

@@ -440,17 +440,17 @@ class ImageDecoder:
 
     def _decode_i4_pixel(self, pixel_int: int) -> bytes:
         p = bytearray(4)
-        p[0] = pixel_int * 0x11
-        p[1] = pixel_int * 0x11
-        p[2] = pixel_int * 0x11
+        p[0] = (pixel_int * 0x11) & 0xFF
+        p[1] = (pixel_int * 0x11) & 0xFF
+        p[2] = (pixel_int * 0x11) & 0xFF
         p[3] = 0xFF
         return p
 
     def _decode_i8_pixel(self, pixel_int: int) -> bytes:
         p = bytearray(4)
-        p[0] = pixel_int
-        p[1] = pixel_int
-        p[2] = pixel_int
+        p[0] = pixel_int & 0xFF
+        p[1] = pixel_int & 0xFF
+        p[2] = pixel_int & 0xFF
         p[3] = 0xFF
         return p
 
@@ -564,6 +564,7 @@ class ImageDecoder:
         ImageFormats.PAL8: 8,
         ImageFormats.PAL16: 16,
         ImageFormats.PAL_I8A8: 16,
+        ImageFormats.PAL32: 32,
     }
 
     def _get_endianess_format(self, endianess: str) -> str:
@@ -579,7 +580,7 @@ class ImageDecoder:
         decode_function, bits_per_pixel, image_entry_read_function = image_format
         image_handler = BytesHandler(image_data)
         texture_data = bytearray(img_width * img_height * 4)
-        read_offset = 0
+        read_offset: int = 0
         image_endianess_format: str = self._get_endianess_format(image_endianess)
 
         if bits_per_pixel == 4:
@@ -648,20 +649,39 @@ class ImageDecoder:
         image_endianess_format: str = self._get_endianess_format(image_endianess)
         palette_endianess_format: str = self._get_endianess_format(palette_endianess)
 
-        palette_data_ints = []
+        palette_data_ints: list = []
         for i in range(len(palette_data) // palette_entry_size):
             palette_entry = palette_handler.get_bytes(palette_offset, palette_entry_size)
             palette_entry_int = palette_entry_read_function(palette_entry, palette_endianess_format)
             palette_offset += palette_entry_size
             palette_data_ints.append(palette_entry_int)
 
-        if img_bits_per_pixel == 16:
+        if img_bits_per_pixel == 4:
+            for i in range(0, img_width * img_height, 2):
+                palette_index: bytes = image_handler.get_bytes(image_offset, 1)
+                palette_index_int: int = struct.unpack(image_endianess_format + "B", palette_index or b'\x00')[0]
+                if image_endianess == "little":
+                    texture_data[i * 4:(i + 1) * 4] = decode_function(self, palette_data_ints[palette_index_int & 0xf])  # noqa
+                    texture_data[(i + 1) * 4:(i + 2) * 4] = decode_function(self, palette_data_ints[(palette_index_int >> 4) & 0xf])  # noqa
+                elif image_endianess == "big":
+                    texture_data[i * 4:(i + 1) * 4] = decode_function(self, palette_data_ints[(palette_index_int >> 4) & 0xf])  # noqa
+                    texture_data[(i + 1) * 4:(i + 2) * 4] =decode_function(self, palette_data_ints[palette_index_int & 0xf])  # noqa
+                else:
+                    raise Exception(f"Endianess not supported! Endianess: {image_endianess}")
+                image_offset += 1
+        elif img_bits_per_pixel == 8:
+            for i in range(img_width * img_height):
+                palette_index: bytes = image_handler.get_bytes(image_offset, 1)
+                palette_index_int: int = struct.unpack(image_endianess_format + "B", palette_index or b'\x00')[0]
+                texture_data[i * 4:(i + 1) * 4] = decode_function(self, palette_data_ints[palette_index_int])  # noqa
+                image_offset += 1
+        elif img_bits_per_pixel == 16:
             for i in range(img_width * img_height):
-                if "pal_i8a8" in image_format.value.lower():
+                if image_format is ImageFormats.PAL_I8A8:
                     palette_index: bytes = image_handler.get_bytes(image_offset, 1)
                     alpha_value: bytes = image_handler.get_bytes(image_offset+1, 1)
-                    palette_index_int: int = struct.unpack(image_endianess_format + "B", palette_index)[0]
-                    alpha_value_int: int = struct.unpack(image_endianess_format + "B", alpha_value)[0]
+                    palette_index_int: int = struct.unpack(image_endianess_format + "B", palette_index or b'\x00')[0]
+                    alpha_value_int: int = struct.unpack(image_endianess_format + "B", alpha_value or b'\x00')[0]
                     output_bytes: bytes = decode_function(self, palette_data_ints[palette_index_int])  # noqa
 
                     decoded_bytes: bytearray = bytearray(4)
@@ -678,29 +698,18 @@ class ImageDecoder:
 
                     texture_data[i * 4:(i + 1) * 4] = decoded_bytes
                 else:
-                    palette_index = image_handler.get_bytes(image_offset, 2)
-                    palette_index_int = struct.unpack(image_endianess_format + "H", palette_index)[0]
+                    palette_index: bytes = image_handler.get_bytes(image_offset, 1)  # PAL16 = I8P8
+                    palette_index_int: int = struct.unpack(image_endianess_format + "B", palette_index or b'\x00')[0]
                     texture_data[i * 4:(i + 1) * 4] = decode_function(self, palette_data_ints[palette_index_int])  # noqa
                 image_offset += 2
-        elif img_bits_per_pixel == 8:
+        elif img_bits_per_pixel == 32:
             for i in range(img_width * img_height):
-                palette_index = image_handler.get_bytes(image_offset, 1)
-                palette_index_int = struct.unpack(image_endianess_format + "B", palette_index)[0]
+                palette_index: bytes = image_handler.get_bytes(image_offset, 1)  # PAL32 = I8P24
+                palette_index_int: int = struct.unpack(image_endianess_format + "B", palette_index or b'\x00')[0]
                 texture_data[i * 4:(i + 1) * 4] = decode_function(self, palette_data_ints[palette_index_int])  # noqa
-                image_offset += 1
-        elif img_bits_per_pixel == 4:
-            for i in range(0, img_width * img_height, 2):
-                palette_index = image_handler.get_bytes(image_offset, 1)
-                palette_index_int = struct.unpack(image_endianess_format + "B", palette_index)[0]
-                if image_endianess == "little":
-                    texture_data[i * 4:(i + 1) * 4] = decode_function(self, palette_data_ints[palette_index_int & 0xf])  # noqa
-                    texture_data[(i + 1) * 4:(i + 2) * 4] = decode_function(self, palette_data_ints[(palette_index_int >> 4) & 0xf])  # noqa
-                elif image_endianess == "big":
-                    texture_data[i * 4:(i + 1) * 4] = decode_function(self, palette_data_ints[(palette_index_int >> 4) & 0xf])  # noqa
-                    texture_data[(i + 1) * 4:(i + 2) * 4] =decode_function(self, palette_data_ints[palette_index_int & 0xf])  # noqa
-                else:
-                    raise Exception(f"Endianess not supported! Endianess: {image_endianess}")
-                image_offset += 1
+                image_offset += 4
+        else:
+            raise Exception(f"Bpp {img_bits_per_pixel} not supported!")
 
         return texture_data
 

{reversebox-0.26.0 → reversebox-0.26.2}/reversebox/image/image_formats.py

@@ -43,7 +43,7 @@ class ImageFormats(Enum):
     BGRX4444 = "bgrx4444"
 
     ARGB4444 = "argb4444"
-    XRGB4444 = "xrbg4444"
+    XRGB4444 = "xrgb4444"
     ABGR4444 = "abgr4444"
     XBGR4444 = "xbgr4444"
 
@@ -87,6 +87,7 @@ class ImageFormats(Enum):
     PAL8 = "pal8"
     PAL16 = "pal16"
     PAL_I8A8 = "pal_i8a8"
+    PAL32 = "pal32"
 
     # N64 / WII formats
     N64_RGB5A3 = "n64_rgb5a3"  # COLOR+ALPHA, 16bpp

{reversebox-0.26.0 → reversebox-0.26.2}/setup.py

@@ -8,7 +8,7 @@ from typing import Final
 
 import setuptools
 
-VERSION_NUM: Final[str] = "0.26.0"
+VERSION_NUM: Final[str] = "0.26.2"
 
 
 def get_long_description() -> str: