Skip to content

Commit 5a42e3d

Browse files
WolfgangKurzK0lb3
andauthored
Support 2021.1 and 2021.3 for Material.py (K0lb3#154)
* Support 2021.1 and 2021.3 for Material.py * Material cleanup * Update Material.py Co-authored-by: Rudolf Kolbe <rkolbe96@gmail.com>
1 parent 9232cdd commit 5a42e3d

1 file changed

Lines changed: 31 additions & 25 deletions

File tree

‎UnityPy/classes/Material.py‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,18 @@ def __init__(self, reader):
88
version = self.version
99
self.m_Shader = PPtr(reader) # Shader
1010

11-
if version >= (5,): # 5.0 and up
11+
if version >= (2021,3): # 2021.3 and up
12+
self.m_ValidKeywords = reader.read_string_array()
13+
self.m_InvalidKeywords = reader.read_string_array()
14+
elif version >= (5,): # 5.0 and up
1215
self.m_ShaderKeywords = reader.read_aligned_string()
1316
self.m_LightmapFlags = reader.read_u_int()
14-
1517
elif version >= (4, 1): # 4.x
1618
self.m_ShaderKeywords = reader.read_string_array()
1719

20+
if version >= (5,):
21+
self.m_LightmapFlags = reader.read_u_int()
22+
1823
if version >= (5, 6): # 5.6 and up
1924
self.m_EnableInstancingVariants = reader.read_boolean()
2025
# var m_DoubleSidedGI = a_Stream.read_boolean() //2017 and up
@@ -24,12 +29,10 @@ def __init__(self, reader):
2429
self.m_CustomRenderQueue = reader.read_int()
2530

2631
if version >= (5, 1): # 5.1 and up
27-
stringTagMapSize = reader.read_int()
28-
self.stringTagMap = {}
29-
for _ in range(stringTagMapSize):
30-
first = reader.read_aligned_string()
31-
second = reader.read_aligned_string()
32-
self.stringTagMap[first] = second
32+
self.stringTagMap = {
33+
reader.read_aligned_string(): reader.read_aligned_string()
34+
for _ in range(reader.read_int())
35+
}
3336

3437
if version >= (5, 6): # 5.6 and up
3538
self.disabledShaderPasses = reader.read_string_array()
@@ -46,20 +49,23 @@ def __init__(self, reader):
4649

4750
class UnityPropertySheet:
4851
def __init__(self, reader):
49-
m_TexEnvsSize = reader.read_int()
50-
self.m_TexEnvs = {}
51-
for i in range(m_TexEnvsSize):
52-
key = reader.read_aligned_string()
53-
self.m_TexEnvs[key] = UnityTexEnv(reader)
54-
55-
m_FloatsSize = reader.read_int()
56-
self.m_Floats = {}
57-
for i in range(m_FloatsSize):
58-
key = reader.read_aligned_string()
59-
self.m_Floats[key] = reader.read_float()
60-
61-
m_ColorsSize = reader.read_int()
62-
self.m_Colors = {}
63-
for i in range(m_ColorsSize):
64-
key = reader.read_aligned_string()
65-
self.m_Colors[key] = reader.read_color4()
52+
self.m_TexEnvs = {
53+
reader.read_aligned_string(): UnityTexEnv(reader)
54+
for _ in range(reader.read_int())
55+
}
56+
57+
if reader.version >= (2021,): # 2021.1 and up
58+
self.m_Ints = {
59+
reader.read_aligned_string(): reader.read_int()
60+
for _ in range(reader.read_int())
61+
}
62+
63+
self.m_Floats = {
64+
reader.read_aligned_string(): reader.read_float()
65+
for _ in range(reader.read_int())
66+
}
67+
68+
self.m_Colors = {
69+
reader.read_aligned_string(): reader.read_color4()
70+
for _ in range(reader.read_int())
71+
}

0 commit comments

Comments
 (0)