Skip to content

Commit fd1bd66

Browse files
committed
convert match/case to if/elif-chan for old versions
1 parent acfba60 commit fd1bd66

2 files changed

Lines changed: 104 additions & 114 deletions

File tree

‎UnityPy/helpers/MeshHelper.py‎

Lines changed: 51 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -401,61 +401,59 @@ def read_vertex_data(
401401

402402
def assign_channel_vertex_data(self, channel: int, component_data: list):
403403
if self.version[0] >= 2018:
404-
match channel:
405-
case 0: # kShaderChannelVertex
406-
self.m_Vertices = component_data
407-
case 1: # kShaderChannelNormal
408-
self.m_Normals = component_data
409-
case 2: # kShaderChannelTangent
410-
self.m_Tangents = component_data
411-
case 3: # kShaderChannelColor
412-
self.m_Colors = component_data
413-
case 4: # kShaderChannelTexCoord0
414-
self.m_UV0 = component_data
415-
case 5: # kShaderChannelTexCoord1
416-
self.m_UV1 = component_data
417-
case 6: # kShaderChannelTexCoord2
418-
self.m_UV2 = component_data
419-
case 7: # kShaderChannelTexCoord3
420-
self.m_UV3 = component_data
421-
case 8: # kShaderChannelTexCoord4
422-
self.m_UV4 = component_data
423-
case 9: # kShaderChannelTexCoord5
424-
self.m_UV5 = component_data
425-
case 10: # kShaderChannelTexCoord6
426-
self.m_UV6 = component_data
427-
case 11: # kShaderChannelTexCoord7
428-
self.m_UV7 = component_data
429-
# 2018.2 and up
430-
case 12: # kShaderChannelBlendWeight
431-
self.m_BoneWeights = component_data
432-
case 13: # kShaderChannelBlendIndices
433-
self.m_BoneIndices = component_data
434-
case _:
435-
raise ValueError(f"Unknown channel {channel}")
404+
if channel == 0: # kShaderChannelVertex
405+
self.m_Vertices = component_data
406+
elif channel == 1: # kShaderChannelNormal
407+
self.m_Normals = component_data
408+
elif channel == 2: # kShaderChannelTangent
409+
self.m_Tangents = component_data
410+
elif channel == 3: # kShaderChannelColor
411+
self.m_Colors = component_data
412+
elif channel == 4: # kShaderChannelTexCoord0
413+
self.m_UV0 = component_data
414+
elif channel == 5: # kShaderChannelTexCoord1
415+
self.m_UV1 = component_data
416+
elif channel == 6: # kShaderChannelTexCoord2
417+
self.m_UV2 = component_data
418+
elif channel == 7: # kShaderChannelTexCoord3
419+
self.m_UV3 = component_data
420+
elif channel == 8: # kShaderChannelTexCoord4
421+
self.m_UV4 = component_data
422+
elif channel == 9: # kShaderChannelTexCoord5
423+
self.m_UV5 = component_data
424+
elif channel == 10: # kShaderChannelTexCoord6
425+
self.m_UV6 = component_data
426+
elif channel == 11: # kShaderChannelTexCoord7
427+
self.m_UV7 = component_data
428+
# 2018.2 and up
429+
elif channel == 12: # kShaderChannelBlendWeight
430+
self.m_BoneWeights = component_data
431+
elif channel == 13: # kShaderChannelBlendIndices
432+
self.m_BoneIndices = component_data
433+
else:
434+
raise ValueError(f"Unknown channel {channel}")
436435
else:
437-
match channel:
438-
case 0: # kShaderChannelVertex
439-
self.m_Vertices = component_data
440-
case 1: # kShaderChannelNormal
441-
self.m_Normals = component_data
442-
case 2: # kShaderChannelColor
443-
self.m_Colors = component_data
444-
case 3: # kShaderChannelTexCoord0
445-
self.m_UV0 = component_data
446-
case 4: # kShaderChannelTexCoord1
447-
self.m_UV1 = component_data
448-
case 5:
449-
if self.version[0] >= 5: # kShaderChannelTexCoord2
450-
self.m_UV2 = component_data
451-
else: # kShaderChannelTangent
452-
self.m_Tangents = component_data
453-
case 6: # kShaderChannelTexCoord3
454-
self.m_UV3 = component_data
455-
case 7: # kShaderChannelTangent
436+
if channel == 0: # kShaderChannelVertex
437+
self.m_Vertices = component_data
438+
elif channel == 1: # kShaderChannelNormal
439+
self.m_Normals = component_data
440+
elif channel == 2: # kShaderChannelColor
441+
self.m_Colors = component_data
442+
elif channel == 3: # kShaderChannelTexCoord0
443+
self.m_UV0 = component_data
444+
elif channel == 4: # kShaderChannelTexCoord1
445+
self.m_UV1 = component_data
446+
elif channel == 5:
447+
if self.version[0] >= 5: # kShaderChannelTexCoord2
448+
self.m_UV2 = component_data
449+
else: # kShaderChannelTangent
456450
self.m_Tangents = component_data
457-
case _:
458-
raise ValueError(f"Unknown channel {channel}")
451+
elif channel == 6: # kShaderChannelTexCoord3
452+
self.m_UV3 = component_data
453+
elif channel == 7: # kShaderChannelTangent
454+
self.m_Tangents = component_data
455+
else:
456+
raise ValueError(f"Unknown channel {channel}")
459457

460458
def get_channel_dtype(self, m_Channel: ChannelInfo):
461459
if self.version[0] < 2017:

‎UnityPy/helpers/TypeTreeHelper.py‎

Lines changed: 53 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
kAlignBytes = 0x4000
2424

25-
FUNCTION_MAP = {
25+
FUNCTION_READ_MAP = {
2626
"SInt8": EndianBinaryReader.read_byte,
2727
"UInt8": EndianBinaryReader.read_u_byte,
2828
"char": EndianBinaryReader.read_u_byte,
@@ -46,7 +46,7 @@
4646
"string": EndianBinaryReader.read_aligned_string,
4747
"TypelessData": EndianBinaryReader.read_byte_array,
4848
}
49-
FUNCTION_MAP_ARRAY = {
49+
FUNCTION_READ_MAP_ARRAY = {
5050
"SInt8": EndianBinaryReader.read_byte_array,
5151
"UInt8": EndianBinaryReader.read_u_byte_array,
5252
"char": EndianBinaryReader.read_u_byte_array,
@@ -137,16 +137,13 @@ def read_value(
137137
# print(reader.Position, node.m_Name, node.m_Type, node.m_MetaFlag)
138138
align = metaflag_is_aligned(node.m_MetaFlag)
139139

140-
func = FUNCTION_MAP.get(node.m_Type)
140+
func = FUNCTION_READ_MAP.get(node.m_Type)
141141
if func:
142142
value = func(reader)
143143
elif node.m_Type == "pair":
144144
first = read_value(node.m_Children[0], reader, as_dict, assetsfile)
145145
second = read_value(node.m_Children[1], reader, as_dict, assetsfile)
146146
value = (first, second)
147-
elif not node.m_Children:
148-
value = None
149-
# raise NotImplementedError(f"Reference type {node.m_Type} not implemented")
150147
# Vector
151148
elif node.m_Children and node.m_Children[0].m_Type == "Array":
152149
if metaflag_is_aligned(node.m_Children[0].m_MetaFlag):
@@ -208,7 +205,7 @@ def read_value_array(
208205
) -> Any:
209206
align = metaflag_is_aligned(node.m_MetaFlag)
210207

211-
func = FUNCTION_MAP_ARRAY.get(node.m_Type)
208+
func = FUNCTION_READ_MAP_ARRAY.get(node.m_Type)
212209
if func:
213210
value = func(reader, size)
214211
elif node.m_Type == "string":
@@ -219,18 +216,15 @@ def read_value_array(
219216
key_node = node.m_Children[0]
220217
value_node = node.m_Children[1]
221218

222-
key_func = FUNCTION_MAP.get(
219+
key_func = FUNCTION_READ_MAP.get(
223220
key_node.m_Type,
224221
lambda reader: read_value(key_node, reader, as_dict, assetsfile),
225222
)
226-
value_func = FUNCTION_MAP.get(
223+
value_func = FUNCTION_READ_MAP.get(
227224
value_node.m_Type,
228225
lambda reader: read_value(value_node, reader, as_dict, assetsfile),
229226
)
230227
value = [(key_func(reader), value_func(reader)) for _ in range(size)]
231-
elif not node.m_Children:
232-
value = None
233-
# raise NotImplementedError(f"Reference type {node.m_Type} not implemented")
234228
# Vector
235229
elif node.m_Children and node.m_Children[0].m_Type == "Array":
236230
if metaflag_is_aligned(node.m_Children[0].m_MetaFlag):
@@ -332,6 +326,32 @@ def clean_name(name: str) -> str:
332326
return name
333327

334328

329+
FUNCTION_WRITE_MAP = {
330+
"SInt8": EndianBinaryWriter.write_byte,
331+
"UInt8": EndianBinaryWriter.write_u_byte,
332+
"char": EndianBinaryWriter.write_u_byte,
333+
"short": EndianBinaryWriter.write_short,
334+
"SInt16": EndianBinaryWriter.write_short,
335+
"unsigned short": EndianBinaryWriter.write_u_short,
336+
"UInt16": EndianBinaryWriter.write_u_short,
337+
"int": EndianBinaryWriter.write_int,
338+
"SInt32": EndianBinaryWriter.write_int,
339+
"unsigned int": EndianBinaryWriter.write_u_int,
340+
"UInt32": EndianBinaryWriter.write_u_int,
341+
"Type*": EndianBinaryWriter.write_u_int,
342+
"long long": EndianBinaryWriter.write_long,
343+
"SInt64": EndianBinaryWriter.write_long,
344+
"unsigned long long": EndianBinaryWriter.write_u_long,
345+
"UInt64": EndianBinaryWriter.write_u_long,
346+
"FileSize": EndianBinaryWriter.write_u_long,
347+
"float": EndianBinaryWriter.write_float,
348+
"double": EndianBinaryWriter.write_double,
349+
"bool": EndianBinaryWriter.write_boolean,
350+
"string": EndianBinaryWriter.write_aligned_string,
351+
"TypelessData": EndianBinaryWriter.write_byte_array,
352+
}
353+
354+
335355
def write_value(
336356
value: Any,
337357
node: TypeTreeNode,
@@ -340,55 +360,27 @@ def write_value(
340360
# print(reader.Position, node.m_Name, node.m_Type, node.m_MetaFlag)
341361
align = metaflag_is_aligned(node.m_MetaFlag)
342362

343-
match node.m_Type:
344-
case "SInt8":
345-
writer.write_byte(value)
346-
case "UInt8" | "char":
347-
writer.write_u_byte(value)
348-
case "short" | "SInt16":
349-
writer.write_short(value)
350-
case "UInt16" | "unsigned short":
351-
writer.write_u_short(value)
352-
case "int" | "SInt32":
353-
writer.write_int(value)
354-
case "UInt32" | "unsigned int" | "Type*":
355-
writer.write_u_int(value)
356-
case "long long" | "SInt64":
357-
writer.write_long(value)
358-
case "UInt64" | "unsigned long long" | "FileSize":
359-
writer.write_u_long(value)
360-
case "float":
361-
writer.write_float(value)
362-
case "double":
363-
writer.write_double(value)
364-
case "bool":
365-
writer.write_boolean(value)
366-
case "string":
367-
writer.write_aligned_string(value)
368-
case "TypelessData":
369-
writer.write_byte_array(value)
370-
case "pair":
371-
write_value(value[0], node.m_Children[0], writer)
372-
write_value(value[1], node.m_Children[1], writer)
373-
case _:
374-
# Vector
375-
if node.m_Children and node.m_Children[0].m_Type == "Array":
376-
if metaflag_is_aligned(node.m_Children[0].m_MetaFlag):
377-
align = True
378-
379-
writer.write_int(len(value))
380-
subtype = node.m_Children[0].m_Children[1]
381-
[write_value(sub_value, subtype, writer) for sub_value in value]
382-
383-
else: # Class
384-
if isinstance(value, dict):
385-
for child in node.m_Children:
386-
write_value(value[child.m_Name], child, writer)
387-
else:
388-
for child in node.m_Children:
389-
write_value(
390-
getattr(value, clean_name(child.m_Name)), child, writer
391-
)
363+
func = FUNCTION_WRITE_MAP.get(node.m_Type)
364+
if func:
365+
value = func(writer, value)
366+
elif node.m_Type == "pair":
367+
write_value(value[0], node.m_Children[0], writer)
368+
write_value(value[1], node.m_Children[1], writer)
369+
elif node.m_Children and node.m_Children[0].m_Type == "Array":
370+
if metaflag_is_aligned(node.m_Children[0].m_MetaFlag):
371+
align = True
372+
373+
writer.write_int(len(value))
374+
subtype = node.m_Children[0].m_Children[1]
375+
[write_value(sub_value, subtype, writer) for sub_value in value]
376+
377+
else: # Class
378+
if isinstance(value, dict):
379+
for child in node.m_Children:
380+
write_value(value[child.m_Name], child, writer)
381+
else:
382+
for child in node.m_Children:
383+
write_value(getattr(value, clean_name(child.m_Name)), child, writer)
392384

393385
if align:
394386
writer.align_stream()

0 commit comments

Comments
 (0)