Skip to content

Commit 6774181

Browse files
committed
Sprite: implement new SpriteBone
1 parent 9083a0d commit 6774181

1 file changed

Lines changed: 36 additions & 10 deletions

File tree

‎UnityPy/classes/Sprite.py‎

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from .PPtr import PPtr
66
from ..export import SpriteHelper
77
from ..enums import SpriteMeshType
8-
from ..streams import EndianBinaryWriter
8+
from ..streams import EndianBinaryWriter, EndianBinaryReader
99

1010

1111
class Sprite(NamedObject):
@@ -50,9 +50,11 @@ def __init__(self, reader):
5050

5151
if version >= (2018,): # 2018 and up
5252
m_BonesSize = reader.read_int()
53-
self.m_Bones = [
54-
reader.read_vector2_array() for _ in range(m_BonesSize)
55-
]
53+
# TODO: might occur in earlier 2020 versions - 2020.3.13 reported
54+
if version >= (2020,3,):
55+
self.m_Bones = [SpriteBone() for _ in range(m_BonesSize)]
56+
else:
57+
self.m_Bones = [reader.read_vector2_array() for _ in range(m_BonesSize)]
5658

5759
def save(self, writer: EndianBinaryWriter = None):
5860
if writer is None:
@@ -91,8 +93,12 @@ def save(self, writer: EndianBinaryWriter = None):
9193

9294
if version >= (2018,): # 2018 and up
9395
writer.write_int(len(self.m_Bones))
94-
for bone in self.m_Bones:
95-
writer.write_vector2_array(bone)
96+
if version >= (2020, 3):
97+
for bone in self.m_Bones:
98+
bone.save(writer)
99+
else:
100+
for bone in self.m_Bones:
101+
writer.write_vector2_array(bone)
96102

97103
self.set_raw_data(writer.bytes)
98104

@@ -124,10 +130,8 @@ class SpriteSettings:
124130
def __init__(self, reader):
125131
self.settingsRaw = reader.read_u_int()
126132
self.packed = self.settingsRaw & 1 # 1
127-
self.packingMode = SpritePackingMode(
128-
(self.settingsRaw >> 1) & 1) # 1
129-
self.packingRotation = SpritePackingRotation(
130-
(self.settingsRaw >> 2) & 0xF) # 4
133+
self.packingMode = SpritePackingMode((self.settingsRaw >> 1) & 1) # 1
134+
self.packingRotation = SpritePackingRotation((self.settingsRaw >> 2) & 0xF) # 4
131135
self.meshType = SpriteMeshType((self.settingsRaw >> 6) & 1) # 1
132136
# rest of the bits are reserved
133137

@@ -236,3 +240,25 @@ def save(self, writer, version):
236240

237241
if version >= (2017,): # 2017 and up
238242
writer.write_float(self.downscaleMultiplier)
243+
244+
245+
class SpriteBone:
246+
name: str
247+
position: tuple
248+
rotation: tuple
249+
length: float
250+
parentId: int
251+
252+
def __init__(self, reader: EndianBinaryReader) -> None:
253+
self.name = reader.read_aligned_string()
254+
self.position = reader.read_vector3()
255+
self.rotation = reader.read_vector3()
256+
self.length = reader.read_float()
257+
self.parentId = reader.read_int()
258+
259+
def save(self, writer: EndianBinaryWriter):
260+
writer.write_aligned_string(self.name)
261+
writer.write_vector3(self.position)
262+
writer.write_vector3(self.rotation)
263+
writer.write_float(self.length)
264+
writer.write_int(self.parentId)

0 commit comments

Comments
 (0)