44from ..helpers .ResourceReader import get_resource_data
55from ..streams import EndianBinaryWriter
66from PIL import Image
7+ from io import BufferedIOBase , RawIOBase , IOBase
78
89
910class 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 ):
0 commit comments