Skip to content

Commit e36862a

Browse files
committed
Mesh topology save fix
1 parent b4a760e commit e36862a

1 file changed

Lines changed: 18 additions & 13 deletions

File tree

‎UnityPy/classes/Mesh.py‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def GetStreams(self):
175175
streamCount = 1
176176
if self.m_Channels:
177177
streamCount += max(x.stream for x in self.m_Channels)
178-
178+
179179
self.m_Streams = {}
180180
offset = 0
181181
for s in range(streamCount):
@@ -199,7 +199,7 @@ def GetStreams(self):
199199
offset += self.m_VertexCount * stride
200200
# static size_t align_streamSize (size_t size) { return (size + (kVertexStreamAlign-1)) & ~(kVertexStreamAlign-1)
201201
offset = (offset + (16 - 1)) & ~(
202-
16 - 1
202+
16 - 1
203203
) # (offset + (16u - 1u)) & ~(16u - 1u);
204204

205205
def GetChannels(self):
@@ -329,7 +329,7 @@ def __init__(self, reader):
329329
def save(self, writer, version):
330330
writer.write_u_int(self.firstByte)
331331
writer.write_u_int(self.indexCount)
332-
writer.write_int(self.topology)
332+
writer.write_int(self.topology.value)
333333

334334
if version < (4,): # 4.0 down
335335
writer.write_u_int(self.triangleCount)
@@ -440,7 +440,8 @@ def __init__(self, reader):
440440
self.m_VertexCount * 3) # Vector3
441441

442442
self.m_SkinSize = reader.read_int()
443-
self.m_Skin = [BoneWeights4(reader) for _ in range(self.m_SkinSize)]
443+
self.m_Skin = [BoneWeights4(reader)
444+
for _ in range(self.m_SkinSize)]
444445

445446
self.m_BindPose = reader.read_matrix_array()
446447
self.m_UV0 = reader.read_float_array(
@@ -554,19 +555,21 @@ def ReadVertexData(self):
554555
componentBytes = bytearray(
555556
m_VertexCount * m_Channel.dimension * componentByteSize)
556557
for v in range(m_VertexCount):
557-
vertexOffset = int(m_Stream.offset) + m_Channel.offset + int(m_Stream.stride) * v
558+
vertexOffset = int(
559+
m_Stream.offset) + m_Channel.offset + int(m_Stream.stride) * v
558560
for d in range(m_Channel.dimension):
559561
componentOffsetSrc = vertexOffset + componentByteSize * d # src offset
560-
componentOffsetDst = componentByteSize * (v * m_Channel.dimension + d) # dst offst
562+
componentOffsetDst = componentByteSize * \
563+
(v * m_Channel.dimension + d) # dst offst
561564

562565
buff = m_VertexData.m_DataSize[componentOffsetSrc:
563566
componentOffsetSrc + componentByteSize]
564-
567+
565568
if self.reader.endian == "<" and componentByteSize > 1: # swap bytes
566569
buff = buff[::-1]
567570

568571
componentBytes[componentOffsetDst: componentOffsetDst +
569-
componentByteSize] = buff
572+
componentByteSize] = buff
570573
# Buffer.BlockCopy(m_VertexData.m_DataSize, componentOffset, componentBytes, componentByteSize * (v * m_Channel.dimension + d), componentByteSize);
571574
# (Array src, int srcOffset, Array dst, int dstOffset, int count);
572575

@@ -643,8 +646,10 @@ def DecompressCompressedMesh(self):
643646
version = self.version
644647
m_CompressedMesh = self.m_CompressedMesh
645648
if m_CompressedMesh.m_Vertices.m_NumItems > 0:
646-
self.m_VertexCount = int(m_CompressedMesh.m_Vertices.m_NumItems / 3)
647-
self.m_Vertices = m_CompressedMesh.m_Vertices.UnpackFloats(3, 3 * 4)
649+
self.m_VertexCount = int(
650+
m_CompressedMesh.m_Vertices.m_NumItems / 3)
651+
self.m_Vertices = m_CompressedMesh.m_Vertices.UnpackFloats(
652+
3, 3 * 4)
648653
m_VertexCount = self.m_VertexCount
649654
# UV
650655
if m_CompressedMesh.m_UV.m_NumItems > 0: #
@@ -663,7 +668,8 @@ def DecompressCompressedMesh(self):
663668
texCoordBits &= (1 << kInfoBitsPerUV) - 1
664669
if (texCoordBits & kUVChannelExists) != 0:
665670
uvDim = 1 + int(texCoordBits & kUVDimensionMask)
666-
m_UV = m_CompressedMesh.m_UV.UnpackFloats(uvDim, uvDim * 4, uvSrcOffset, self.m_VertexCount)
671+
m_UV = m_CompressedMesh.m_UV.UnpackFloats(
672+
uvDim, uvDim * 4, uvSrcOffset, self.m_VertexCount)
667673
self.SetUV(uv, m_UV)
668674
else:
669675
self.m_UV0 = m_CompressedMesh.m_UV.UnpackFloats(
@@ -835,11 +841,10 @@ def GetTriangles(self):
835841
raise NotImplementedError(
836842
"Failed getting triangles. Submesh topology is lines or points.")
837843

838-
839844
def InitMSkin(self):
840845
self.m_Skin = [BoneWeights4() for _ in range(self.m_VertexCount)]
841846

842-
def SetUV(self, uv:int, m_UV):
847+
def SetUV(self, uv: int, m_UV):
843848
if uv == 0:
844849
self.m_UV0 = m_UV
845850
elif uv == 1:

0 commit comments

Comments
 (0)