refactor(texture): texture loading accelerated even more again

Author: danila-schelkov

xcoder/bytestream.py

@@ -1,36 +1,45 @@
 import io
+import struct
 from typing import Literal
 
 
-class Reader(io.BytesIO):
+class Reader:
     def __init__(
         self,
         initial_buffer: bytes = b"",
         endian: Literal["little", "big"] = "little",
     ):
-        super().__init__(initial_buffer)
+        self._internal_reader = io.BytesIO(initial_buffer)
+
         self.endian: Literal["little", "big"] = endian
+        self.endian_sign: Literal["<", ">"] = "<" if endian == "little" else ">"
+
+    def seek(self, position: int) -> None:
+        self._internal_reader.seek(position)
 
-    def read_integer(self, length: int, signed=False) -> int:
-        return int.from_bytes(self.read(length), self.endian, signed=signed)
+    def tell(self) -> int:
+        return self._internal_reader.tell()
+
+    def read(self, size: int) -> bytes:
+        return self._internal_reader.read(size)
 
     def read_uchar(self) -> int:
-        return self.read_integer(1)
+        return struct.unpack("B", self.read(1))[0]
 
     def read_char(self) -> int:
-        return self.read_integer(1, True)
+        return struct.unpack("b", self.read(1))[0]
 
     def read_ushort(self) -> int:
-        return self.read_integer(2)
+        return struct.unpack(f"{self.endian_sign}H", self.read(2))[0]
 
     def read_short(self) -> int:
-        return self.read_integer(2, True)
+        return struct.unpack(f"{self.endian_sign}h", self.read(2))[0]
 
     def read_uint(self) -> int:
-        return self.read_integer(4)
+        return struct.unpack(f"{self.endian_sign}I", self.read(4))[0]
 
     def read_int(self) -> int:
-        return self.read_integer(4, True)
+        return struct.unpack(f"{self.endian_sign}i", self.read(4))[0]
 
     def read_twip(self) -> float:
         return self.read_int() / 20
@@ -72,6 +81,7 @@ def write_string(self, string: str | None = None):
         if string is None:
             self.write_byte(0xFF)
             return
+
         encoded = string.encode()
         self.write_byte(len(encoded))
         self.write(encoded)

xcoder/images.py

@@ -135,9 +135,9 @@ def load_texture(reader: Reader, pixel_type: int, width: int, height: int) -> No
         pixel_buffer.write(channel_count.to_bytes(1, "little"))
 
         for y in range(height):
-            for x in range(width):
-                pixel = read_pixel(reader)
-                pixel_buffer.write(bytearray(pixel))
+            pixel_buffer.write(
+                b"".join([bytearray(read_pixel(reader)) for _ in range(width)])
+            )
 
             Console.progress_bar(locale.crt_pic, y, height)
 

xcoder/pixel_utils.py

@@ -27,12 +27,7 @@ def get_channel_count_by_pixel_type(pixel_type: int) -> int:
 
 
 def _read_rgba8(reader: Reader) -> PixelChannels:
-    return (
-        reader.read_uchar(),
-        reader.read_uchar(),
-        reader.read_uchar(),
-        reader.read_uchar(),
-    )
+    return tuple(reader.read(4))
 
 
 def _read_rgba4(reader: Reader) -> PixelChannels:
@@ -61,11 +56,11 @@ def _read_rgb565(reader: Reader) -> PixelChannels:
 
 
 def _read_luminance8_alpha8(reader: Reader) -> PixelChannels:
-    return (reader.read_uchar(), reader.read_uchar())[::-1]
+    return tuple(reader.read(2))[::-1]
 
 
 def _read_luminance8(reader: Reader) -> PixelChannels:
-    return (reader.read_uchar(),)
+    return tuple(reader.read(1))
 
 
 def _write_rgba8(pixel: PixelChannels) -> bytes: