Skip to content

Commit 17d67e5

Browse files
committed
1.7.34 - SpriteAtlasData 2020,2+ added
fixes K0lb3#81
1 parent 415f7aa commit 17d67e5

7 files changed

Lines changed: 45 additions & 39 deletions

File tree

‎UnityPy/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "1.7.33"
1+
__version__ = "1.7.34"
22

33
from .environment import Environment
44

‎UnityPy/classes/Sprite.py‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from .NamedObject import NamedObject
55
from .PPtr import PPtr
66
from ..export import SpriteHelper
7-
from ..enums import SpriteMeshType
7+
from ..enums import SpriteMeshType, SpritePackingMode, SpritePackingRotation
88
from ..streams import EndianBinaryWriter, EndianBinaryReader
99

1010

@@ -51,7 +51,10 @@ def __init__(self, reader):
5151
if version >= (2018,): # 2018 and up
5252
m_BonesSize = reader.read_int()
5353
# TODO: might occur in earlier 2020 versions - 2020.3.13 reported
54-
if version >= (2020,3,):
54+
if version >= (
55+
2020,
56+
3,
57+
):
5558
self.m_Bones = [SpriteBone() for _ in range(m_BonesSize)]
5659
else:
5760
self.m_Bones = [reader.read_vector2_array() for _ in range(m_BonesSize)]
@@ -113,19 +116,6 @@ def save(self, writer):
113116
writer.write_string_to_null(self.name)
114117

115118

116-
class SpritePackingRotation(IntEnum):
117-
kSPRNone = (0,)
118-
kSPRFlipHorizontal = (1,)
119-
kSPRFlipVertical = (2,)
120-
kSPRRotate180 = (3,)
121-
kSPRRotate90 = 4
122-
123-
124-
class SpritePackingMode(IntEnum):
125-
kSPMTight = (0,)
126-
kSPMRectangle = 1
127-
128-
129119
class SpriteSettings:
130120
def __init__(self, reader):
131121
self.settingsRaw = reader.read_u_int()

‎UnityPy/classes/SpriteAtlas.py‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
from .NamedObject import NamedObject
22
from .PPtr import PPtr
3-
from .Sprite import SpriteSettings
3+
from .Sprite import SpriteSettings, SecondarySpriteTexture
44

55

66
class SpriteAtlas(NamedObject):
77
def __init__(self, reader):
88
super().__init__(reader=reader)
99
packed_sprites_size = reader.read_int()
10-
self.m_PackedSprites = [PPtr(reader)
11-
for _ in range(packed_sprites_size)]
10+
self.m_PackedSprites = [PPtr(reader) for _ in range(packed_sprites_size)]
1211

1312
self.m_PackedSpriteNamesToIndex = reader.read_string_array()
1413
m_render_data_map_size = reader.read_int()
@@ -22,13 +21,20 @@ def __init__(self, reader):
2221

2322
class SpriteAtlasData:
2423
def __init__(self, reader):
25-
self.version = reader.version
24+
self.version = version = reader.version
2625
self.texture = PPtr(reader) # Texture2D
2726
self.alphaTexture = PPtr(reader) # Texture2D
2827
self.textureRect = reader.read_rectangle_f()
2928
self.textureRectOffset = reader.read_vector2()
30-
if self.version >= (2017, 2): # 2017.2 and up
29+
if version >= (2017, 2): # 2017.2 and up
3130
self.atlasRectOffset = reader.read_vector2()
3231
self.uvTransform = reader.read_vector4()
3332
self.downscaleMultiplier = reader.read_float()
3433
self.settingsRaw = SpriteSettings(reader)
34+
35+
if version >= (2020, 2):
36+
secondaryTexturesSize = reader.read_int()
37+
self.secondaryTextures = [
38+
SecondarySpriteTexture(reader) for _ in range(secondaryTexturesSize)
39+
]
40+
reader.align_stream()

‎UnityPy/enums/SpritePackingMode.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from enum import IntEnum
2+
3+
class SpritePackingMode(IntEnum):
4+
kSPMTight = 0
5+
kSPMRectangle = 1
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
from enum import IntEnum
2+
3+
class SpritePackingRotation(IntEnum):
4+
kSPRNone = 0
5+
kSPRFlipHorizontal = 1
6+
kSPRFlipVertical = 2
7+
kSPRRotate180 = 3
8+
kSPRRotate90 = 4

‎UnityPy/enums/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@
99
from .ShaderCompilerPlatform import ShaderCompilerPlatform
1010
from .ShaderGpuProgramType import ShaderGpuProgramType
1111
from .SerializedPropertyType import SerializedPropertyType
12+
from .SpritePackingMode import SpritePackingMode
13+
from .SpritePackingRotation import SpritePackingRotation
1214
from .TextureDimension import TextureDimension
1315
from .PassType import PassType

‎UnityPy/export/SpriteHelper.py‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,18 @@
1-
from enum import IntEnum
1+
from enum import IntEnum, IntFlag
22

33
from PIL import Image, ImageDraw
44

55
from .Texture2DConverter import get_image_from_texture2d
6-
from ..enums import ClassIDType
6+
from ..enums import ClassIDType, SpritePackingMode, SpritePackingRotation
77
from ..streams import EndianBinaryReader
88

99

10-
# should be imported from Sprite, but too lazy to fix the import issues caused by that
11-
class SpritePackingRotation(IntEnum):
12-
kSPRNone = (0,)
13-
kSPRFlipHorizontal = (1,)
14-
kSPRFlipVertical = (2,)
15-
kSPRRotate180 = (3,)
16-
kSPRRotate90 = 4
17-
18-
19-
class SpritePackingMode(IntEnum):
20-
kSPMTight = (0,)
21-
kSPMRectangle = 1
22-
23-
2410
def get_image(sprite, texture, alpha_texture) -> Image:
25-
if alpha_texture and getattr(alpha_texture, "type", ClassIDType.UnknownType) == ClassIDType.Texture2D:
11+
if (
12+
alpha_texture
13+
and getattr(alpha_texture, "type", ClassIDType.UnknownType)
14+
== ClassIDType.Texture2D
15+
):
2616
cache_id = (texture.path_id, alpha_texture.path_id)
2717
if cache_id not in sprite.assets_file._cache:
2818
original_image = get_image_from_texture2d(texture.read(), False)
@@ -65,7 +55,12 @@ def get_image_from_sprite(m_Sprite) -> Image:
6555
original_image = get_image(m_Sprite, m_Texture2D, alpha_texture)
6656

6757
sprite_image = original_image.crop(
68-
(texture_rect.x, texture_rect.y, texture_rect.x + texture_rect.width, texture_rect.y + texture_rect.height)
58+
(
59+
texture_rect.x,
60+
texture_rect.y,
61+
texture_rect.x + texture_rect.width,
62+
texture_rect.y + texture_rect.height,
63+
)
6964
)
7065

7166
if settings_raw.packed == 1:

0 commit comments

Comments
 (0)