@@ -19,13 +19,30 @@ def image(self, img):
1919 raise Exception ("No image provided" )
2020
2121 self .image_data = img_data
22- self .m_CompleteImageSize = len (self .image_data )
22+ # width * height * channel count
23+ self .m_CompleteImageSize = img .width * img .height * len (img .getbands ())
2324 self .m_TextureFormat = tex_format
24-
25+
26+ @property
27+ def image_data (self ):
28+ return self ._image_data
29+
30+ @image_data .setter
31+ def image_data (self , data ):
32+ self ._image_data = data
33+ # prefer writing to cab if possible
2534 if self .m_StreamData :
26- self .m_StreamData .offset = 0
27- self .m_StreamData .size = 0
28- self .m_StreamData .path = ''
35+ cab = self .assets_file .get_writeable_cab ()
36+ if cab :
37+ self .m_StreamData .offset = cab .Position
38+ cab .write (data )
39+ self .m_StreamData .size = len (data )
40+ self .m_StreamData .path = cab .name
41+ else :
42+ self .m_StreamData .offset = 0
43+ self .m_StreamData .size = 0
44+ self .m_StreamData .path = ''
45+
2946
3047 def __init__ (self , reader ):
3148 super ().__init__ (reader = reader )
@@ -35,7 +52,7 @@ def __init__(self, reader):
3552 self .m_Height = reader .read_int ()
3653 self .m_CompleteImageSize = reader .read_int ()
3754 if version >= (2020 ,): # 2020.1 and up
38- self .mips_stripped = reader .read_int ()
55+ self .m_MipsStripped = reader .read_int ()
3956 self .m_TextureFormat = TextureFormat (reader .read_int ())
4057 if version [:2 ] < (5 , 2 ): # 5.2 down
4158 self .m_MipMap = reader .read_boolean ()
@@ -45,13 +62,13 @@ def __init__(self, reader):
4562 if version >= (2 , 6 ): # 2.6 and up
4663 self .m_IsReadable = reader .read_boolean () # 2.6 and up
4764 if version >= (2020 ,): # 2020.1 and up
48- self .is_pre_processed = reader .read_boolean ()
65+ self .IsPreProcessed = reader .read_boolean ()
4966 if version >= (2019 , 3 ): # 2019.3 and up
50- self .ignore_master_texture_limit = reader .read_boolean ()
67+ self .m_IgnoreMasterTextureLimit = reader .read_boolean ()
5168 if (3 ,) <= version [:2 ] <= (5 , 4 ): # 3.0 - 5.4
5269 self .m_ReadAllowed = reader .read_boolean ()
5370 if version >= (2018 , 2 ): # 2018.2 and up
54- self .m_streaming_mipmaps = reader .read_boolean ()
71+ self .m_StreamingMipmaps = reader .read_boolean ()
5572
5673 reader .align_stream ()
5774 if version >= (2018 , 2 ): # 2018.2 and up
@@ -68,19 +85,22 @@ def __init__(self, reader):
6885 reader .align_stream ()
6986
7087 image_data_size = reader .read_int ()
71- self .image_data = b""
88+ self ._image_data = b""
7289
73- if image_data_size == 0 and version >= (5 , 3 ): # 5.3 and up
90+ if image_data_size != 0 :
91+ self ._image_data = reader .read_bytes (image_data_size )
92+
93+ self .m_StreamData = None
94+ if version >= (5 , 3 ): # 5.3 and up
95+ # always read the StreamingInfo for resaving
7496 self .m_StreamData = StreamingInfo (reader , version )
75- if self .m_StreamData .size :
76- self .image_data = get_resource_data (
97+ if image_data_size == 0 and self .m_StreamData .path :
98+ self ._image_data = get_resource_data (
7799 self .m_StreamData .path ,
78100 self .assets_file ,
79101 self .m_StreamData .offset ,
80102 self .m_StreamData .size ,
81103 )
82- else :
83- self .image_data = reader .read_bytes (image_data_size )
84104
85105 def save (self , writer : EndianBinaryWriter = None ):
86106 if writer is None :
@@ -124,21 +144,29 @@ def save(self, writer: EndianBinaryWriter = None):
124144 writer .write_byte_array (self .m_PlatformBlob )
125145 writer .align_stream ()
126146
127- if self . m_StreamData and self . m_StreamData . path :
128- writer . write_int ( 0 )
129- else :
147+
148+ if version [: 2 ] < ( 5 , 3 ):
149+ # version without m_StreamData
130150 writer .write_int (len (self .image_data ))
131151 writer .write_bytes (self .image_data )
132-
133- self .m_StreamData .save (writer , version )
152+ else :
153+ # decide if m_StreamData is used
154+ if self .m_StreamData .path :
155+ # used -> don't save the image_data
156+ writer .write_int (0 )
157+ else :
158+ writer .write_int (len (self .image_data ))
159+ writer .write_bytes (self .image_data )
160+
161+ self .m_StreamData .save (writer , version )
134162
135163 self .set_raw_data (writer .bytes )
136164
137165
138166class StreamingInfo :
139- offset : int = 0
140- size : int = 0
141- path : str = ""
167+ offset : int
168+ size : int
169+ path : str
142170
143171 def __init__ (self , reader , version ):
144172 if version >= (2020 ,): # 2020.1 and up
0 commit comments