ReverseBox 0.84.2__tar.gz → 0.84.4__tar.gz

{reversebox-0.84.2 → reversebox-0.84.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ReverseBox
-Version: 0.84.2
+Version: 0.84.4
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda

{reversebox-0.84.2 → reversebox-0.84.4}/ReverseBox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ReverseBox
-Version: 0.84.2
+Version: 0.84.4
 Summary: A set of functions useful in reverse engineering.
 Home-page: https://github.com/bartlomiejduda/ReverseBox
 Author: Bartlomiej Duda

{reversebox-0.84.2 → reversebox-0.84.4}/reversebox/image/decoders/gst_decoder_encoder.py

@@ -3,6 +3,8 @@ Copyright © 2024-2026  Bartłomiej Duda
 License: GPL-3.0 License
 """
 
+from typing import Tuple
+
 from reversebox.common.logger import get_logger
 from reversebox.compression.compression_gst import decompress_gst_image
 from reversebox.image.image_formats import ImageFormats
@@ -85,12 +87,11 @@ class GSTImageDecoderEncoder:
 
         return decompressed_texture_data
 
-    def encode_gst_image_main(self, encoded_image_data: bytes, encoded_palette_data: bytes, img_width: int, img_height: int,
-                              gst_format: ImageFormats,  is_swizzled: bool) -> bytes:
+    # converts RGBA8888 to GST
+    def encode_gst_image_main(self, image_data: bytes, img_width: int, img_height: int,
+                              gst_format: ImageFormats,  is_swizzled: bool) -> Tuple[bytes, bytes]:
         block_width, block_height, detail_bpp = self.gst_data_formats[gst_format]
 
-        gst_data: bytes = b''
-
         # compress GST
         # TODO
 
@@ -98,4 +99,4 @@ class GSTImageDecoderEncoder:
         if is_swizzled:
             pass  # TODO
 
-        return gst_data
+        return b'',  b''

{reversebox-0.84.2 → reversebox-0.84.4}/reversebox/image/image_decoder.py

@@ -631,7 +631,7 @@ class ImageDecoder:
         p[3] = pixel_int >> 8
         return p
 
-    def _decode_r_only_pixel(self, pixel_int: int) -> bytes:
+    def _decode_r8_only_pixel(self, pixel_int: int) -> bytes:
         p = bytearray(4)
         p[0] = pixel_int & 0xFF
         p[1] = 0x00
@@ -639,7 +639,23 @@ class ImageDecoder:
         p[3] = 0xFF
         return p
 
-    def _decode_g_only_pixel(self, pixel_int: int) -> bytes:
+    def _decode_r16_only_pixel(self, pixel_int: int) -> bytes:
+        p = bytearray(4)
+        p[0] = (pixel_int & 0xFFFF) >> 8
+        p[1] = 0x00
+        p[2] = 0x00
+        p[3] = 0xFF
+        return p
+
+    def _decode_r32_only_pixel(self, pixel_int: int) -> bytes:
+        p = bytearray(4)
+        p[0] = (pixel_int >> 24) & 0xFF
+        p[1] = 0x00
+        p[2] = 0x00
+        p[3] = 0xFF
+        return p
+
+    def _decode_g8_only_pixel(self, pixel_int: int) -> bytes:
         p = bytearray(4)
         p[0] = 0x00
         p[1] = pixel_int & 0xFF
@@ -647,7 +663,23 @@ class ImageDecoder:
         p[3] = 0xFF
         return p
 
-    def _decode_b_only_pixel(self, pixel_int: int) -> bytes:
+    def _decode_g16_only_pixel(self, pixel_int: int) -> bytes:
+        p = bytearray(4)
+        p[0] = 0x00
+        p[1] = (pixel_int & 0xFFFF) >> 8
+        p[2] = 0x00
+        p[3] = 0xFF
+        return p
+
+    def _decode_g32_only_pixel(self, pixel_int: int) -> bytes:
+        p = bytearray(4)
+        p[0] = 0x00
+        p[1] = (pixel_int >> 24) & 0xFF
+        p[2] = 0x00
+        p[3] = 0xFF
+        return p
+
+    def _decode_b8_only_pixel(self, pixel_int: int) -> bytes:
         p = bytearray(4)
         p[0] = 0x00
         p[1] = 0x00
@@ -655,6 +687,22 @@ class ImageDecoder:
         p[3] = 0xFF
         return p
 
+    def _decode_b16_only_pixel(self, pixel_int: int) -> bytes:
+        p = bytearray(4)
+        p[0] = 0x00
+        p[1] = 0x00
+        p[2] = (pixel_int & 0xFFFF) >> 8
+        p[3] = 0xFF
+        return p
+
+    def _decode_b32_only_pixel(self, pixel_int: int) -> bytes:
+        p = bytearray(4)
+        p[0] = 0x00
+        p[1] = 0x00
+        p[2] = (pixel_int >> 24) & 0xFF
+        p[3] = 0xFF
+        return p
+
     # placeholder function
     def _decode_null_pixel(self, pixel_int: int) -> bytes:
         p = bytearray(4)
@@ -684,9 +732,9 @@ class ImageDecoder:
         ImageFormats.BGR332: (_decode_bgr332_pixel, 8, get_uint8),
         ImageFormats.GRAY8: (_decode_gray8_pixel, 8, get_uint8),  # GRAY, 8bpp, same as N64_I8
         ImageFormats.N64_IA4: (_decode_ia4_pixel, 8, get_uint8),  # GRAY+ALPHA, 8bpp
-        ImageFormats.R8: (_decode_r_only_pixel, 8, get_uint8),
-        ImageFormats.G8: (_decode_g_only_pixel, 8, get_uint8),
-        ImageFormats.B8: (_decode_b_only_pixel, 8, get_uint8),
+        ImageFormats.R8: (_decode_r8_only_pixel, 8, get_uint8),
+        ImageFormats.G8: (_decode_g8_only_pixel, 8, get_uint8),
+        ImageFormats.B8: (_decode_b8_only_pixel, 8, get_uint8),
 
         ImageFormats.GRAY8A: (_decode_gray8a_pixel, 16, get_uint16),
         ImageFormats.GRAY16: (_decode_gray16_pixel, 16, get_uint16),
@@ -716,9 +764,9 @@ class ImageDecoder:
         ImageFormats.N64_IA8: (_decode_ia8_pixel, 16, get_uint16),  # GRAY+ALPHA, 16bpp
         ImageFormats.N64_RGB5A3: (_decode_rgb5A3_pixel, 16, get_uint16),
         ImageFormats.N64_BGR5A3: (_decode_bgr5A3_pixel, 16, get_uint16),
-        ImageFormats.R16: (_decode_r_only_pixel, 16, get_uint16),
-        ImageFormats.G16: (_decode_g_only_pixel, 16, get_uint16),
-        ImageFormats.B16: (_decode_b_only_pixel, 16, get_uint16),
+        ImageFormats.R16: (_decode_r16_only_pixel, 16, get_uint16),
+        ImageFormats.G16: (_decode_g16_only_pixel, 16, get_uint16),
+        ImageFormats.B16: (_decode_b16_only_pixel, 16, get_uint16),
 
         ImageFormats.RGBX6666: (_decode_rgbx6666_pixel, 24, get_uint24),
         ImageFormats.RGBA6666: (_decode_rgba6666_pixel, 24, get_uint24),
@@ -735,9 +783,9 @@ class ImageDecoder:
         ImageFormats.BGRX8888: (_decode_bgrx8888_pixel, 32, get_uint32),
         ImageFormats.BGRT8888: (_decode_bgrt8888_pixel, 32, get_uint32),
         ImageFormats.RGBM8888: (_decode_rgbm8888_pixel, 32, get_uint32),
-        ImageFormats.R32: (_decode_r_only_pixel, 32, get_uint32),
-        ImageFormats.G32: (_decode_g_only_pixel, 32, get_uint32),
-        ImageFormats.B32: (_decode_b_only_pixel, 32, get_uint32),
+        ImageFormats.R32: (_decode_r32_only_pixel, 32, get_uint32),
+        ImageFormats.G32: (_decode_g32_only_pixel, 32, get_uint32),
+        ImageFormats.B32: (_decode_b32_only_pixel, 32, get_uint32),
         ImageFormats.IA_X2_ARGB: (_decode_null_pixel, 32, get_uint32),  # two IA palettes (16 bit + 16 bit)
         ImageFormats.IA_X2_GRAB: (_decode_null_pixel, 32, get_uint32),  # two IA palettes (16 bit + 16 bit)
 

{reversebox-0.84.2 → reversebox-0.84.4}/reversebox/image/image_encoder.py

@@ -621,7 +621,5 @@ class ImageEncoder:
     def encode_n64_image(self, image_data: bytes, img_width: int, img_height: int, image_format: ImageFormats) -> bytes:
         return N64ImageDecoderEncoder().encode_n64_image_main(image_data, img_width, img_height, image_format)
 
-    def encode_gst_image(self, image_data: bytes, img_width: int, img_height: int, gst_format: ImageFormats, image_format: ImageFormats,
-                         palette_format: ImageFormats, max_color_count: int, is_swizzled: bool = True) -> bytes:
-        encoded_image_data, encoded_palette_data = self.encode_indexed_image(image_data, img_width, img_height, image_format, palette_format, max_color_count)
-        return GSTImageDecoderEncoder().encode_gst_image_main(encoded_image_data, encoded_palette_data, img_width, img_height, gst_format, is_swizzled)
+    def encode_gst_image(self, image_data: bytes, img_width: int, img_height: int, gst_format: ImageFormats, is_swizzled: bool = True) -> Tuple[bytes, bytes]:
+        return GSTImageDecoderEncoder().encode_gst_image_main(image_data, img_width, img_height, gst_format, is_swizzled)

{reversebox-0.84.2 → reversebox-0.84.4}/setup.py

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