Skip to content

Commit eb37887

Browse files
committed
1.2.6.6 - Sprite->Atlas fix
1 parent 4fb7c17 commit eb37887

4 files changed

Lines changed: 134 additions & 151 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ install:
2222
# 'python3' is a 'command not found' error on Windows but 'py' works on Windows only
2323
script:
2424
- python3 setup.py install || python setup.py install
25-
# - pytest -v
25+
- pytest -v

‎UnityPy/enums/FileType.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ class FileType(Enum):
55
AssetsFile = 0
66
BundleFile = 1
77
WebFile = 2
8+
ResourceFile = 9
89
ZIP = 10

‎UnityPy/export/SpriteHelper.py‎

Lines changed: 131 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -1,156 +1,138 @@
11
from enum import IntEnum
22

3-
import PIL
3+
from PIL import Image, ImageDraw
44

55
from .Texture2DConverter import get_image_from_texture2d
6+
from ..streams import EndianBinaryReader
67

78

8-
# should be imported from Sprite, but not possible
9+
# should be imported from Sprite, but too lazy to fix the import issues caused by that
910
class SpritePackingRotation(IntEnum):
10-
kSPRNone = 0,
11-
kSPRFlipHorizontal = 1,
12-
kSPRFlipVertical = 2,
13-
kSPRRotate180 = 3,
14-
kSPRRotate90 = 4
15-
16-
17-
def get_image(sprite, texture, alpha_texture) -> PIL.Image:
18-
if alpha_texture and getattr(alpha_texture, 'type', '') == "Texture2D":
19-
cache_id = (texture.path_id, alpha_texture.path_id)
20-
if cache_id not in sprite.assets_file._cache:
21-
original_image = get_image_from_texture2d(texture.read(), False)
22-
alpha_image = get_image_from_texture2d(alpha_texture.read(), False)
23-
original_image = PIL.Image.merge('RGBA', (*original_image.split()[:3], alpha_image.split()[0]))
24-
sprite.assets_file._cache[cache_id] = original_image
25-
else:
26-
cache_id = texture.path_id
27-
if cache_id not in sprite.assets_file._cache:
28-
original_image = get_image_from_texture2d(texture.read(), False)
29-
sprite.assets_file._cache[cache_id] = original_image
30-
return sprite.assets_file._cache[cache_id]
31-
32-
33-
def get_image_from_sprite(m_Sprite) -> PIL.Image:
34-
if m_Sprite.m_SpriteAtlas:
35-
sprite_atlas_data = m_Sprite.m_SpriteAtlas.read().render_data_map[m_Sprite.m_RenderDataKey]
36-
else:
37-
sprite_atlas_data = m_Sprite.m_RD
38-
39-
m_Texture2D = sprite_atlas_data.texture
40-
alpha_texture = sprite_atlas_data.alphaTexture
41-
texture_rect = sprite_atlas_data.textureRect
42-
texture_rect_offset = sprite_atlas_data.textureRectOffset
43-
settings_raw = sprite_atlas_data.settingsRaw
44-
45-
original_image = get_image(m_Sprite, m_Texture2D, alpha_texture)
46-
47-
sprite_image = original_image.crop((texture_rect.left, texture_rect.top, texture_rect.right,
48-
texture_rect.bottom))
49-
50-
if settings_raw.packed == 1:
51-
rotation = settings_raw.packingRotation
52-
if rotation == SpritePackingRotation.kSPRFlipHorizontal:
53-
sprite_image = sprite_image.transpose(PIL.Image.FLIP_TOP_BOTTOM)
54-
# spriteImage = RotateFlip(RotateFlipType.RotateNoneFlipX)
55-
elif rotation == SpritePackingRotation.kSPRFlipVertical:
56-
sprite_image = sprite_image.transpose(PIL.Image.FLIP_LEFT_RIGHT)
57-
# spriteImage.RotateFlip(RotateFlipType.RotateNoneFlipY)
58-
elif rotation == SpritePackingRotation.kSPRRotate180:
59-
sprite_image = sprite_image.transpose(PIL.Image.ROTATE_180)
60-
# spriteImage.RotateFlip(RotateFlipType.Rotate180FlipNone)
61-
elif rotation == SpritePackingRotation.kSPRRotate90:
62-
sprite_image = sprite_image.transpose(PIL.Image.ROTATE_270)
63-
# spriteImage.RotateFlip(RotateFlipType.Rotate270FlipNone)
64-
65-
# Tight
66-
"""
67-
FillPath has to be figured out
68-
69-
if settingsRaw.packingMode == SpritePackingMode.kSPMTight:
70-
try:
71-
triangles = GetTriangles(m_Sprite.m_RD)
72-
points = triangles.Select(x => x.Select(y => new PointF(y.X, y.Y)).ToArray())
73-
#using (var path = new GraphicsPath())
74-
for p in points:
75-
path.AddPolygon(p)
76-
77-
matr = Matrix()
78-
79-
version = m_Sprite.version
80-
if version[0] < 5 or (version[0] == 5 and version[1] < 4) or (version[0] == 5 and version[1] == 4 and version[2] <= 1): #5.4.1p3 down
81-
matr.Translate(m_Sprite.m_Rect.Width * 0.5 - textureRectOffset.X, m_Sprite.m_Rect.Height * 0.5 - textureRectOffset.Y)
82-
else:
83-
matr.Translate(m_Sprite.m_Rect.Width * m_Sprite.m_Pivot.X - textureRectOffset.X, m_Sprite.m_Rect.Height * m_Sprite.m_Pivot.Y - textureRectOffset.Y)
84-
matr.Scale(m_Sprite.m_PixelsToUnits, m_Sprite.m_PixelsToUnits)
85-
path.Transform(matr)
86-
87-
bitmap = PIL.Image.new(originalImage.mode ,(textureRectI.Width, textureRectI.Height))
88-
bitmap.FillPath(spriteImage, path)
89-
return ImageOps.flip(bitmap)
90-
91-
except:
92-
pass
93-
"""
94-
# Rectangle
95-
return sprite_image.transpose(PIL.Image.FLIP_TOP_BOTTOM)
96-
97-
98-
"""
99-
private static Vector2[][] GetTriangles(SpriteRenderData m_RD)
100-
{
101-
if (m_RD.vertices != null) #5.6 down
102-
{
103-
var vertices = m_RD.vertices.Select(x => (Vector2)x.pos).ToArray();
104-
var triangleCount = m_RD.indices.Length / 3;
105-
var triangles = new Vector2[triangleCount][];
106-
for (int i = 0; i < triangleCount; i++)
107-
{
108-
var first = m_RD.indices[i * 3];
109-
var second = m_RD.indices[i * 3 + 1];
110-
var third = m_RD.indices[i * 3 + 2];
111-
var triangle = new[] { vertices[first], vertices[second], vertices[third] };
112-
triangles[i] = triangle;
113-
}
114-
return triangles;
115-
}
116-
117-
return GetTriangles(m_RD.m_VertexData, m_RD.m_SubMeshes, m_RD.m_IndexBuffer); #5.6 and up
118-
}
119-
120-
private static Vector2[][] GetTriangles(VertexData m_VertexData, SubMesh[] m_SubMeshes, byte[] m_IndexBuffer)
121-
{
122-
var triangles = new List<Vector2[]>();
123-
var m_Channel = m_VertexData.m_Channels[0]; #kShaderChannelVertex
124-
var m_Stream = m_VertexData.m_Streams[m_Channel.stream];
125-
using (BinaryReader vertexReader = new BinaryReader(new MemoryStream(m_VertexData.m_DataSize)),
126-
indexReader = new BinaryReader(new MemoryStream(m_IndexBuffer)))
127-
{
128-
foreach (var subMesh in m_SubMeshes)
129-
{
130-
vertexReader.BaseStream.Position = m_Stream.offset + subMesh.firstVertex * m_Stream.stride + m_Channel.offset;
131-
132-
var vertices = new Vector2[subMesh.vertexCount];
133-
for (int v = 0; v < subMesh.vertexCount; v++)
134-
{
135-
vertices[v] = vertexReader.ReadVector3();
136-
vertexReader.BaseStream.Position += m_Stream.stride - 12;
137-
}
138-
139-
indexReader.BaseStream.Position = subMesh.firstByte;
140-
141-
var triangleCount = subMesh.indexCount / 3u;
142-
for (int i = 0; i < triangleCount; i++)
143-
{
144-
var first = indexReader.ReadUInt16() - subMesh.firstVertex;
145-
var second = indexReader.ReadUInt16() - subMesh.firstVertex;
146-
var third = indexReader.ReadUInt16() - subMesh.firstVertex;
147-
var triangle = new[] { vertices[first], vertices[second], vertices[third] };
148-
triangles.Add(triangle);
149-
}
150-
}
151-
}
152-
return triangles.ToArray();
153-
}
154-
}
155-
}
156-
"""
11+
kSPRNone = 0,
12+
kSPRFlipHorizontal = 1,
13+
kSPRFlipVertical = 2,
14+
kSPRRotate180 = 3,
15+
kSPRRotate90 = 4
16+
17+
18+
class SpritePackingMode(IntEnum):
19+
kSPMTight = 0,
20+
kSPMRectangle = 1
21+
22+
23+
def get_image(sprite, texture, alpha_texture) -> Image:
24+
if alpha_texture and getattr(alpha_texture, 'type', '') == "Texture2D":
25+
cache_id = (texture.path_id, alpha_texture.path_id)
26+
if cache_id not in sprite.assets_file._cache:
27+
original_image = get_image_from_texture2d(texture.read(), False)
28+
alpha_image = get_image_from_texture2d(alpha_texture.read(), False)
29+
original_image = Image.merge('RGBA', (*original_image.split()[:3], alpha_image.split()[0]))
30+
sprite.assets_file._cache[cache_id] = original_image
31+
else:
32+
cache_id = texture.path_id
33+
if cache_id not in sprite.assets_file._cache:
34+
original_image = get_image_from_texture2d(texture.read(), False)
35+
sprite.assets_file._cache[cache_id] = original_image
36+
return sprite.assets_file._cache[cache_id]
37+
38+
39+
def get_image_from_sprite(m_Sprite) -> Image:
40+
atlas = None
41+
if m_Sprite.m_SpriteAtlas:
42+
atlas = m_Sprite.m_SpriteAtlas
43+
elif m_Sprite.m_AtlasTags:
44+
# looks like the direct pointer is empty, let's try to find the Atlas via its name
45+
for obj in m_Sprite.assets_file.objects.values():
46+
if obj.type == "SpriteAtlas":
47+
atlas = obj.read()
48+
if atlas.name == m_Sprite.m_AtlasTags[0]:
49+
break
50+
51+
if atlas:
52+
sprite_atlas_data = atlas.render_data_map[m_Sprite.m_RenderDataKey]
53+
else:
54+
sprite_atlas_data = m_Sprite.m_RD
55+
56+
m_Texture2D = sprite_atlas_data.texture
57+
alpha_texture = sprite_atlas_data.alphaTexture
58+
texture_rect = sprite_atlas_data.textureRect
59+
texture_rect_offset = sprite_atlas_data.textureRectOffset
60+
settings_raw = sprite_atlas_data.settingsRaw
61+
62+
original_image = get_image(m_Sprite, m_Texture2D, alpha_texture)
63+
64+
sprite_image = original_image.crop((texture_rect.left, texture_rect.top, texture_rect.right,
65+
texture_rect.bottom))
66+
67+
if settings_raw.packed == 1:
68+
rotation = settings_raw.packingRotation
69+
if rotation == SpritePackingRotation.kSPRFlipHorizontal:
70+
sprite_image = sprite_image.transpose(Image.FLIP_TOP_BOTTOM)
71+
# spriteImage = RotateFlip(RotateFlipType.RotateNoneFlipX)
72+
elif rotation == SpritePackingRotation.kSPRFlipVertical:
73+
sprite_image = sprite_image.transpose(Image.FLIP_LEFT_RIGHT)
74+
# spriteImage.RotateFlip(RotateFlipType.RotateNoneFlipY)
75+
elif rotation == SpritePackingRotation.kSPRRotate180:
76+
sprite_image = sprite_image.transpose(Image.ROTATE_180)
77+
# spriteImage.RotateFlip(RotateFlipType.Rotate180FlipNone)
78+
elif rotation == SpritePackingRotation.kSPRRotate90:
79+
sprite_image = sprite_image.transpose(Image.ROTATE_270)
80+
# spriteImage.RotateFlip(RotateFlipType.Rotate270FlipNone)
81+
82+
if settings_raw.packingMode == SpritePackingMode.kSPMTight:
83+
# Tight
84+
85+
# create mask to keep only the polygon
86+
points = get_points(m_Sprite.m_RD)
87+
points = normalize_points(points, m_Sprite.m_PixelsToUnits)
88+
mask = Image.new("1", sprite_image.size, color=0)
89+
draw = ImageDraw.ImageDraw(mask)
90+
draw.polygon(points, fill=1)
91+
92+
# apply the mask
93+
empty_img = Image.new(sprite_image.mode, sprite_image.size, color=0)
94+
sprite_image = Image.composite(sprite_image, empty_img, mask)
95+
96+
return sprite_image.transpose(Image.FLIP_TOP_BOTTOM)
97+
98+
99+
def normalize_points(points, mod):
100+
min_x = min(p.X for p in points)
101+
min_y = min(p.Y for p in points)
102+
return [
103+
((p.X - min_x) * mod, (p.Y - min_y) * mod)
104+
for p in points
105+
]
106+
107+
108+
def get_points(m_RD):
109+
"""
110+
returns the vertices of the sprite
111+
"""
112+
if hasattr(m_RD, "vertices"): # 5.6 down
113+
vertices = [v.pos for v in m_RD.vertices]
114+
# points = [
115+
# vertices[index]
116+
# for index in range(m_RD.indices)
117+
# ]
118+
else: # 5.6 and up
119+
m_Channel = m_RD.m_VertexData.m_Channels[0] # kShaderChannelVertex
120+
m_Stream = m_RD.m_VertexData.m_Streams[m_Channel.stream]
121+
122+
vertexReader = EndianBinaryReader(m_RD.m_VertexData.m_DataSize, endian='<')
123+
# indexReader = EndianBinaryReader(m_RD.m_IndexBuffer, endian='<')
124+
125+
for subMesh in m_RD.m_SubMeshes:
126+
vertexReader.Position = m_Stream.offset + subMesh.firstVertex * m_Stream.stride + m_Channel.offset
127+
128+
vertices = []
129+
for _ in range(subMesh.vertexCount):
130+
vertices.append(vertexReader.read_vector3())
131+
vertexReader.Position = vertexReader.Position + m_Stream.stride - 12
132+
133+
# indexReader.Position = subMesh.firstByte
134+
135+
# for _ in range(subMesh.indexCount):
136+
# points.append(vertices[indexReader.read_u_short() - subMesh.firstVertex])
137+
138+
return vertices

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
setuptools.setup(
77
name="UnityPy",
88
packages=setuptools.find_packages(),
9-
version="1.2.6.5",
9+
version="1.2.6.6",
1010
author="K0lb3",
1111
description="A pythonic port of AssetStudio by Perfare",
1212
long_description=long_description,

0 commit comments

Comments
 (0)