ReverseBox 0.47.2__tar.gz → 0.48.0__tar.gz

{reversebox-0.47.2 → reversebox-0.48.0}/PKG-INFO

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

{reversebox-0.47.2 → reversebox-0.48.0}/ReverseBox.egg-info/PKG-INFO

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

{reversebox-0.47.2 → reversebox-0.48.0}/ReverseBox.egg-info/SOURCES.txt

@@ -80,12 +80,10 @@ reversebox/image/compression/compression_zlib.py
 reversebox/image/decoders/__init__.py
 reversebox/image/decoders/bumpmap_decoder.py
 reversebox/image/decoders/compressed_decoder_encoder.py
-reversebox/image/decoders/gst_decoder.py
+reversebox/image/decoders/gst_decoder_encoder.py
 reversebox/image/decoders/n64_decoder.py
 reversebox/image/decoders/pvrtexlib_decoder_encoder.py
 reversebox/image/decoders/yuv_decoder.py
-reversebox/image/encoders/__init__.py
-reversebox/image/encoders/gst_encoder.py
 reversebox/image/file_formats/__init__.py
 reversebox/image/file_formats/image_dds.py
 reversebox/image/palettes/__init__.py

reversebox-0.47.2/reversebox/image/decoders/gst_decoder.py → reversebox-0.48.0/reversebox/image/decoders/gst_decoder_encoder.py

@@ -1,5 +1,5 @@
 """
-Copyright © 2024  Bartłomiej Duda
+Copyright © 2024-2025  Bartłomiej Duda
 License: GPL-3.0 License
 """
 
@@ -17,7 +17,7 @@ logger = get_logger(__name__)
 # fmt: off
 
 
-class GSTImageDecoder:
+class GSTImageDecoderEncoder:
     """
     Decoder for any PS2 GST images
     """
@@ -84,3 +84,18 @@ class GSTImageDecoder:
                                                                 block_height, detail_bpp)
 
         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:
+        block_width, block_height, detail_bpp = self.gst_data_formats[gst_format]
+
+        gst_data: bytes = b''
+
+        # compress GST
+        # TODO
+
+        # swizzle GST data
+        if is_swizzled:
+            pass  # TODO
+
+        return gst_data

{reversebox-0.47.2 → reversebox-0.48.0}/reversebox/image/image_decoder.py

@@ -11,7 +11,7 @@ from reversebox.image.decoders.bumpmap_decoder import BumpmapDecoder
 from reversebox.image.decoders.compressed_decoder_encoder import (
     CompressedImageDecoderEncoder,
 )
-from reversebox.image.decoders.gst_decoder import GSTImageDecoder
+from reversebox.image.decoders.gst_decoder_encoder import GSTImageDecoderEncoder
 from reversebox.image.decoders.n64_decoder import N64Decoder
 from reversebox.image.decoders.pvrtexlib_decoder_encoder import (
     PvrTexlibImageDecoderEncoder,
@@ -814,7 +814,7 @@ class ImageDecoder:
         return PvrTexlibImageDecoderEncoder().decode_compressed_image_main(image_data, img_width, img_height, image_format)
 
     def decode_gst_image(self, image_data: bytes, palette_data: bytes, img_width: int, img_height: int, image_format: ImageFormats, convert_format: ImageFormats, convert_pal_format: ImageFormats, is_swizzled: bool = True) -> bytes:
-        gst_decoder = GSTImageDecoder()
+        gst_decoder = GSTImageDecoderEncoder()
         decoded_gst_data: bytes = gst_decoder.decode_gst_image_main(image_data, img_width, img_height, image_format, is_swizzled)
         return self.decode_indexed_image(decoded_gst_data, palette_data, img_width, img_height, convert_format, convert_pal_format)
 

{reversebox-0.47.2 → reversebox-0.48.0}/reversebox/image/image_encoder.py

@@ -17,6 +17,7 @@ from reversebox.image.common import (
 from reversebox.image.decoders.compressed_decoder_encoder import (
     CompressedImageDecoderEncoder,
 )
+from reversebox.image.decoders.gst_decoder_encoder import GSTImageDecoderEncoder
 from reversebox.image.decoders.pvrtexlib_decoder_encoder import (
     PvrTexlibImageDecoderEncoder,
 )
@@ -540,3 +541,8 @@ class ImageEncoder:
 
     def encode_pvrtexlib_image(self, image_data: bytes, img_width: int, img_height: int, image_format: ImageFormats) -> bytes:
         return PvrTexlibImageDecoderEncoder().encode_compressed_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)

{reversebox-0.47.2 → reversebox-0.48.0}/setup.py

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

reversebox-0.47.2/reversebox/image/encoders/gst_encoder.py

@@ -1,38 +0,0 @@
-"""
-Copyright © 2024  Bartłomiej Duda
-License: GPL-3.0 License
-"""
-
-from reversebox.common.logger import get_logger
-from reversebox.image.image_formats import ImageFormats
-
-logger = get_logger(__name__)
-
-# fmt: off
-
-
-class GSTImageEncoder:
-    """
-    Encoder for any PS2 GST images
-    """
-
-    def __init__(self):
-        pass
-
-    gst_data_formats = {
-        # image_format: (block_width, block_height, detail_bpp)
-        ImageFormats.GST121: (1, 2, 1),
-        ImageFormats.GST221: (2, 2, 1),
-        ImageFormats.GST421: (4, 2, 1),
-        ImageFormats.GST821: (8, 2, 1),
-        ImageFormats.GST122: (1, 2, 2),
-        ImageFormats.GST222: (2, 2, 2),
-        ImageFormats.GST422: (4, 2, 2),
-        ImageFormats.GST822: (8, 2, 2),
-    }
-
-    def encode_gst_image_main(self, image_data: bytes, img_width: int, img_height: int, image_format: ImageFormats, is_swizzled: bool) -> bytes:
-        block_width, block_height, detail_bpp = self.gst_data_formats[image_format]
-
-        # TODO
-        return b''