Skip to content

fix Texture2D import for dxt5 swizzle #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 31, 2025
Merged

fix Texture2D import for dxt5 swizzle #323

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b20add2
fix Texture2D import for dxt5 swizzle
May 29, 2025
51fbf44
chore(ruff)
K0lb3 May 31, 2025
f461ac5
chore(Texture2DConverter): deduplicate switch handling
K0lb3 May 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions UnityPy/export/Texture2DConverter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,9 @@ def image_to_texture2d(
tex_format = TF.RGB24
pil_mode = "RGB"
# everything else defaulted to RGBA
if compress_func:
width, height = get_compressed_image_size(img.width, img.height, tex_format)
img = pad_image(img, width, height)
enc_img = compress_func(
img.tobytes("raw", "RGBA"), img.width, img.height, tex_format
)
else:
enc_img = img.tobytes("raw", pil_mode)

width, height = img.width, img.height
switch_info = None

if TextureSwizzler.is_switch_swizzled(platform, platform_blob):
if TYPE_CHECKING:
Expand All @@ -244,11 +239,22 @@ def image_to_texture2d(
width, height = TextureSwizzler.get_padded_texture_size(
img.width, img.height, *block_size, gobsPerBlock
)
if not compress_func:
# recompress with padding and corrected image mode
switch_info = (block_size, gobsPerBlock)

if compress_func:
width, height = get_compressed_image_size(width, height, tex_format)
img = pad_image(img, width, height)
enc_img = compress_func(
img.tobytes("raw", "RGBA"), img.width, img.height, tex_format
)
else:
if switch_info is not None:
img = pad_image(img, width, height)
enc_img = img.tobytes("raw", pil_mode)

enc_img = img.tobytes("raw", pil_mode)

if switch_info is not None:
block_size, gobsPerBlock = switch_info
enc_img = bytes(
TextureSwizzler.swizzle(enc_img, width, height, *block_size, gobsPerBlock)
)
Expand Down