Skip to content

Commit

Permalink
Merge pull request #2 from radarhere/vtf-support
Browse files Browse the repository at this point in the history 
Restored black formatting, and minor changes
  • Loading branch information
@REDxEYE
REDxEYE authored Aug 12, 2022
2 parents 6485071 + df129de commit 8067c22
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 59 deletions.
122 changes: 71 additions & 51 deletions src/PIL/VtfImagePlugin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,28 +142,30 @@ class VtfPF(IntEnum):
VtfPF.UV88,
)

BLOCK_COMPRESSED = (
VtfPF.DXT1,
VtfPF.DXT1_ONEBITALPHA,
VtfPF.DXT3,
VtfPF.DXT5)
BLOCK_COMPRESSED = (VtfPF.DXT1, VtfPF.DXT1_ONEBITALPHA, VtfPF.DXT3, VtfPF.DXT5)
SUPPORTED_FORMATS = RGBA_FORMATS + RGB_FORMATS + LA_FORMATS + L_FORMATS
HEADER_V70 = '<I2HI2H4x3f4xfIbI2b'
HEADER_V72 = '<I2HI2H4x3f4xfIbI2bH'
HEADER_V73 = '<I2HI2H4x3f4xfIbI2bH3xI8x'
HEADER_V70 = "<I2HI2H4x3f4xfIbI2b"
HEADER_V72 = "<I2HI2H4x3f4xfIbI2bH"
HEADER_V73 = "<I2HI2H4x3f4xfIbI2bH3xI8x"


# fmt: off
def _get_texture_size(pixel_format: VtfPF, width, height):
if pixel_format in (VtfPF.DXT1, VtfPF.DXT1_ONEBITALPHA):
return width * height // 2
elif pixel_format in (VtfPF.DXT3, VtfPF.DXT5,) + L_FORMATS:
elif (
pixel_format
in (
VtfPF.DXT3,
VtfPF.DXT5,
)
+ L_FORMATS
):
return width * height
elif pixel_format in LA_FORMATS:
return width * height * 2
elif pixel_format in (VtfPF.RGB888,):
elif pixel_format == VtfPF.RGB888:
return width * height * 3
elif pixel_format in (VtfPF.RGBA8888,):
elif pixel_format == VtfPF.RGBA8888:
return width * height * 4
raise VTFException(f"Unsupported VTF pixel format: {pixel_format}")

Expand All @@ -181,17 +183,13 @@ def _get_mipmap_count(width: int, height: int):

def closest_power(x):
possible_results = round(log(x, 2)), ceil(log(x, 2))
return 2 ** min(possible_results, key=lambda z: abs(x - 2 ** z))


# fmt: on
return 2 ** min(possible_results, key=lambda z: abs(x - 2**z))


class VtfImageFile(ImageFile.ImageFile):
format = "VTF"
format_description = "Valve Texture Format"

# fmt: off
def _open(self):
if not _accept(self.fp.read(12)):
raise SyntaxError("not a VTF file")
Expand All @@ -200,16 +198,26 @@ def _open(self):
if version <= (7, 2):
header = VTFHeader(
*struct.unpack(HEADER_V70, self.fp.read(struct.calcsize(HEADER_V70))),
0, 0, 0, 0, 0)
0,
0,
0,
0,
0,
)
self.fp.seek(header.header_size)
elif (7, 2) <= version < (7, 3):
elif version < (7, 3):
header = VTFHeader(
*struct.unpack(HEADER_V72, self.fp.read(struct.calcsize(HEADER_V72))),
0, 0, 0, 0)
0,
0,
0,
0,
)
self.fp.seek(header.header_size)
elif (7, 3) <= version < (7, 5):
elif version < (7, 5):
header = VTFHeader(
*struct.unpack(HEADER_V73, self.fp.read(struct.calcsize(HEADER_V73))))
*struct.unpack(HEADER_V73, self.fp.read(struct.calcsize(HEADER_V73)))
)
self.fp.seek(header.header_size)
else:
raise VTFException(f"Unsupported VTF version: {version}")
Expand All @@ -232,7 +240,7 @@ def _open(self):

data_start = self.fp.tell()
data_start += _get_texture_size(low_format, header.low_width, header.low_height)
min_res = (4 if pixel_format in BLOCK_COMPRESSED else 1)
min_res = 4 if pixel_format in BLOCK_COMPRESSED else 1
for mip_id in range(header.mipmap_count - 1, 0, -1):
mip_width = max(header.width >> mip_id, min_res)
mip_height = max(header.height >> mip_id, min_res)
Expand All @@ -256,22 +264,21 @@ def _open(self):
else:
raise VTFException(f"Unsupported VTF pixel format: {pixel_format}")
self.tile = [tile]
# fmt: on


def _save(im, fp, filename):
im: Image.Image
if im.mode not in ("RGB", "RGBA"):
raise OSError(f"cannot write mode {im.mode} as VTF")
arguments = im.encoderinfo
pixel_format = VtfPF(arguments.get('pixel_format', VtfPF.RGBA8888))
version = arguments.get('version', (7, 4))
encoderinfo = im.encoderinfo
pixel_format = VtfPF(encoderinfo.get("pixel_format", VtfPF.RGBA8888))
version = encoderinfo.get("version", (7, 4))
flags = CompiledVtfFlags(0)
if 'A' in im.mode:
if "A" in im.mode:
if pixel_format == VtfPF.DXT1_ONEBITALPHA:
flags |= CompiledVtfFlags.ONEBITALPHA
elif pixel_format == VtfPF.DXT1:
im = im.convert('RGB')
im = im.convert("RGB")
else:
flags |= CompiledVtfFlags.EIGHTBITALPHA

Expand All @@ -281,21 +288,32 @@ def _save(im, fp, filename):
mipmap_count = _get_mipmap_count(width, height)

thumb_buffer = BytesIO()
thumb = im.convert('RGB')
thumb = im.convert("RGB")
thumb.thumbnail(((min(16, width)), (min(16, height))))
thumb = thumb.resize((closest_power(thumb.width), closest_power(thumb.height)))
ImageFile._save(thumb, thumb_buffer, [("bcn", (0, 0) + thumb.size, 0, (1, 'DXT1'))])

header = VTFHeader(0, width, height, flags,
1, 0, 1.0, 1.0, 1.0,
1.0, pixel_format, mipmap_count, VtfPF.DXT1,
thumb.width, thumb.height,
1, 2)

fp.write(
b"VTF\x00"
+ struct.pack('<2I', *version)
ImageFile._save(thumb, thumb_buffer, [("bcn", (0, 0) + thumb.size, 0, (1, "DXT1"))])

header = VTFHeader(
0,
width,
height,
flags,
1,
0,
1.0,
1.0,
1.0,
1.0,
pixel_format,
mipmap_count,
VtfPF.DXT1,
thumb.width,
thumb.height,
1,
2,
)

fp.write(b"VTF\x00" + struct.pack("<2I", *version))
if version < (7, 2):
size = struct.calcsize(HEADER_V70) + 12
header = header._replace(header_size=size + (16 - size % 16))
Expand All @@ -309,15 +327,15 @@ def _save(im, fp, filename):
header = header._replace(header_size=size + (16 - size % 16))
fp.write(struct.pack(HEADER_V73, *header))
else:
raise VTFException(f'Unsupported version {version}')
raise VTFException(f"Unsupported version {version}")

if version > (7, 2):
fp.write(b'\x01\x00\x00\x00')
fp.write(struct.pack('<I', header.header_size))
fp.write(b'\x30\x00\x00\x00')
fp.write(struct.pack('<I', header.header_size + len(thumb_buffer.getbuffer())))
fp.write(b"\x01\x00\x00\x00")
fp.write(struct.pack("<I", header.header_size))
fp.write(b"\x30\x00\x00\x00")
fp.write(struct.pack("<I", header.header_size + len(thumb_buffer.getbuffer())))
else:
fp.write(b'\x00' * (16 - fp.tell() % 16))
fp.write(b"\x00" * (16 - fp.tell() % 16))
fp.write(thumb_buffer.getbuffer())

for mip_id in range(mipmap_count - 1, 0, -1):
Expand All @@ -326,11 +344,13 @@ def _save(im, fp, filename):
mip = im.resize((mip_width, mip_height))
buffer_size = mip_width * mip_height // 2
extents = (0, 0) + mip.size
ImageFile._save(mip, fp,
[("bcn", extents, fp.tell(), (1, 'DXT1'))], buffer_size)
ImageFile._save(
mip, fp, [("bcn", extents, fp.tell(), (1, "DXT1"))], buffer_size
)
buffer_size = im.width * im.height // 2
ImageFile._save(im, fp,
[("bcn", (0, 0) + im.size, fp.tell(), (1, 'DXT1'))], buffer_size)
ImageFile._save(
im, fp, [("bcn", (0, 0) + im.size, fp.tell(), (1, "DXT1"))], buffer_size
)


def _accept(prefix):
Expand Down
2 changes: 1 addition & 1 deletion src/encode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ get_packer(ImagingEncoderObject *encoder, const char *mode, const char *rawmode)
}

/* -------------------------------------------------------------------- */
/* BNC */
/* BCN */
/* -------------------------------------------------------------------- */

PyObject *
Expand Down
20 changes: 13 additions & 7 deletions src/libImaging/BcnEncode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,11 @@ selection_sort(Color arr[], UINT32 n) {

for (i = 0; i < n - 1; i++) {
min_idx = i;
for (j = i + 1; j < n; j++)
if (arr[j].frequency < arr[min_idx].frequency)
for (j = i + 1; j < n; j++) {
if (arr[j].frequency < arr[min_idx].frequency) {
min_idx = j;
}
}
SWAP(Color, arr[min_idx], arr[i]);
}
}
Expand All @@ -103,8 +105,9 @@ pick_2_major_colors(

if (color_count == 1) {
*color1 = colors[color_count - 1].value;
} else
} else {
*color1 = colors[color_count - 2].value;
}
}

static UINT8
Expand All @@ -131,8 +134,9 @@ encode_bc1(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
bc1_color *blocks = (bc1_color *)buf;
UINT8 no_alpha = 0;
INT32 block_index;
if (strchr(im->mode, 'A') == NULL)
if (strchr(im->mode, 'A') == NULL) {
no_alpha = 1;
}
UINT32 block_count = (im->xsize * im->ysize) / 16;
if (block_count * sizeof(bc1_color) > bytes) {
state->errcode = IMAGING_CODEC_MEMORY;
Expand Down Expand Up @@ -185,8 +189,9 @@ encode_bc1(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {

UINT16 c0 = 0, c1 = 0;
pick_2_major_colors(unique_colors, color_frequency, unique_count, &c0, &c1);
if (c0 < c1 && no_alpha)
if (c0 < c1 && no_alpha) {
SWAP(UINT16, c0, c1);
}

UINT16 palette[4] = {c0, c1, 0, 0};
if (no_alpha) {
Expand All @@ -203,10 +208,11 @@ encode_bc1(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
UINT32 color_id;
for (color_id = 0; color_id < 16; ++color_id) {
UINT8 bc_color_id;
if (opaque[color_id] || no_alpha)
if (opaque[color_id] || no_alpha) {
bc_color_id = get_closest_color_index(palette, all_colors[color_id]);
else
} else {
bc_color_id = 3;
}
SET_BITS(block->lut, color_id * 2, 2, bc_color_id);
}
}
Expand Down

0 comments on commit 8067c22

Please sign in to comment.