Skip to content

Commit 5b0a688

Browse files
Allow non-PIL image sources (K0lb3#64)
(while minding possible texture compression) Allow external cab name setting through File
1 parent a0ff974 commit 5b0a688

3 files changed

Lines changed: 46 additions & 33 deletions

File tree

‎UnityPy/classes/Texture2D.py‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from ..helpers.ResourceReader import get_resource_data
55
from ..streams import EndianBinaryWriter
66
from PIL import Image
7+
from io import BufferedIOBase, RawIOBase, IOBase
78

89

910
class Texture2D(Texture):
@@ -12,22 +13,32 @@ def image(self):
1213
return Texture2DConverter.get_image_from_texture2d(self)
1314

1415
@image.setter
15-
def image(self, img: Image):
16+
def image(self, img):
1617
# img is PIL.Image / image path / opened file
1718
# overwrite original image data with the RGB(A) image data and sets the correct new format
18-
img_data, tex_format = Texture2DConverter.image_to_texture(img)
1919
if img is None:
2020
raise Exception("No image provided")
2121

22+
if (isinstance(img, str) or isinstance(img, BufferedIOBase) or
23+
isinstance(img, RawIOBase) or isinstance(img, IOBase)):
24+
img = Image.open(img)
25+
26+
img_data, tex_format = Texture2DConverter.image_to_texture2d(img)
2227
self.image_data = img_data
2328
# width * height * channel count
24-
self.m_CompleteImageSize = img.width * img.height * len(img.getbands())
29+
self.m_CompleteImageSize = len(self._image_data)# img.width * img.height * len(img.getbands())
2530
self.m_TextureFormat = tex_format
2631

2732
@property
2833
def image_data(self):
2934
return self._image_data
3035

36+
def reset_streamdata(self):
37+
if not self.m_StreamData: return
38+
self.m_StreamData.offset = 0
39+
self.m_StreamData.size = 0
40+
self.m_StreamData.path = ""
41+
3142
@image_data.setter
3243
def image_data(self, data: bytes):
3344
self._image_data = data
@@ -40,25 +51,22 @@ def image_data(self, data: bytes):
4051
self.m_StreamData.size = len(data)
4152
self.m_StreamData.path = cab.path
4253
else:
43-
self.m_StreamData.offset = 0
44-
self.m_StreamData.size = 0
45-
self.m_StreamData.path = ""
54+
self.reset_streamdata()
4655

4756
def set_image(
48-
self, img: Image, target_format: TextureFormat = None, in_cab: bool = False
57+
self, img, target_format: TextureFormat = None, in_cab: bool = False
4958
):
50-
img_data, tex_format = Texture2DConverter.image_to_texture(img)
5159
if img is None:
5260
raise Exception("No image provided")
61+
img_data, tex_format = Texture2DConverter.image_to_texture2d(img)
62+
5363
if in_cab:
5464
self.image_data = img_data
5565
else:
5666
self._image_data = img_data
57-
self.m_StreamData.offset = 0
58-
self.m_StreamData.size = 0
59-
self.m_StreamData.path = ""
67+
self.reset_streamdata()
6068
# width * height * channel count
61-
self.m_CompleteImageSize = img.width * img.height * len(img.getbands())
69+
self.m_CompleteImageSize = len(self._image_data)#img.width * img.height * len(img.getbands())
6270
self.m_TextureFormat = tex_format
6371

6472
def __init__(self, reader):

‎UnityPy/export/Texture2DConverter.py‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
import texture2ddecoder
22
from PIL import Image
33
from copy import copy
4-
from io import BytesIO, BufferedIOBase, RawIOBase, IOBase
4+
from io import BytesIO
55
import struct
66
from ..enums import TextureFormat, BuildTarget
77

88
TF = TextureFormat
99

1010

11-
def image_to_texture(img: Image, flip: bool = True):
11+
def image_to_texture2d(img: Image, flip: bool = True):
1212
# tex for eventually later usage of compressions
13-
_image = None
14-
if (isinstance(img, str) or isinstance(img, BufferedIOBase) or
15-
isinstance(img, RawIOBase) or isinstance(img, IOBase)):
16-
_image = Image.open(img)
17-
elif isinstance(img, Image.Image):
18-
_image = img
19-
if _image:
20-
if flip:
21-
_image = _image.transpose(Image.FLIP_TOP_BOTTOM)
22-
13+
14+
tex_format = None
15+
if flip:
16+
img = img.transpose(Image.FLIP_TOP_BOTTOM)
17+
2318
if img.mode == "RGBA":
2419
tex_format = TextureFormat.RGBA32
2520
elif img.mode == "RGB":
2621
tex_format = TextureFormat.RGB24
27-
elif len(img.mode) == "A":
22+
elif img.mode == "A":
2823
tex_format = TextureFormat.Alpha8
29-
return _image.tobytes(), tex_format
24+
25+
return img.tobytes(), tex_format
3026

3127

3228
def get_image_from_texture2d(texture_2d, flip=True) -> Image:
@@ -46,15 +42,15 @@ def get_image_from_texture2d(texture_2d, flip=True) -> Image:
4642
texture_format = texture_2d.m_TextureFormat if isinstance(texture_2d, TextureFormat) else TextureFormat(
4743
texture_2d.m_TextureFormat)
4844
selection = CONV_TABLE[texture_format]
49-
45+
5046
if len(selection) == 0:
5147
raise NotImplementedError(
5248
f"Not implemented texture format: {texture_format.name}"
5349
)
54-
50+
5551
if texture_format in XBOX_SWAP_FORMATS:
5652
image_data = swap_bytes_for_xbox(image_data, texture_2d.platform)
57-
53+
5854
if "Crunched" in texture_format.name:
5955
version = texture_2d.version
6056
if (version[0] > 2017 or (version[0] == 2017 and version[1] >= 3) # 2017.3 and up
@@ -63,11 +59,11 @@ def get_image_from_texture2d(texture_2d, flip=True) -> Image:
6359
image_data = texture2ddecoder.unpack_unity_crunch(image_data)
6460
else:
6561
image_data = texture2ddecoder.unpack_crunch(image_data)
66-
62+
6763
img = selection[0](
6864
image_data, texture_2d.m_Width, texture_2d.m_Height, *selection[1:]
6965
)
70-
66+
7167
if img and flip:
7268
return img.transpose(Image.FLIP_TOP_BOTTOM)
7369
return img
@@ -111,7 +107,7 @@ def atc(image_data: bytes, width: int, height: int, alpha: bool) -> Image:
111107
image_data = texture2ddecoder.decode_atc_rgba8(image_data, width, height)
112108
else:
113109
image_data = texture2ddecoder.decode_atc_rgb4(image_data, width, height)
114-
110+
115111
return Image.frombytes("RGBA", (width, height), image_data, "raw", "BGRA")
116112

117113

‎UnityPy/files/File.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
class File(object):
1111
name: str
1212
files: dict
13+
cab_file: str
1314
is_changed: bool
1415
signature: str
1516
packer: str
@@ -19,6 +20,7 @@ class File(object):
1920
def __init__(self, parent=None):
2021
self.files = {}
2122
self.is_changed = False
23+
self.cab_file = "CAB-UnityPy_Mod.resS"
2224
self.parent = parent
2325

2426
def get_assets(self):
@@ -68,11 +70,18 @@ def read_files(self, reader: EndianBinaryReader, files: list):
6870
f.flags = getattr(node, "flags", 0)
6971
self.files[name] = f
7072

71-
def get_writeable_cab(self, name: str = "CAB-UnityPy_Mod.resS"):
73+
def get_writeable_cab(self, name: str = None):
7274
"""
7375
Creates a new cab file in the bundle that contains the given data.
7476
This is usefull for asset types that use resource files.
7577
"""
78+
79+
if not name:
80+
name = self.cab_file
81+
82+
if not name:
83+
return None
84+
7685
if name in self.files:
7786
if isinstance(self.files[name], EndianBinaryWriter):
7887
return self.files[name]

0 commit comments

Comments
 (0)