Merge branch 'master' into patch-mesh-2

Author: K0lb3

UnityPy/helpers/MeshHelper.py

@@ -567,7 +567,6 @@ def decompress_compressed_mesh(self):
         # Skin
         if m_CompressedMesh.m_Weights.m_NumItems > 0:
             weightsData = unpack_ints(m_CompressedMesh.m_Weights)
-            weightsData = [weight / 31 for weight in weightsData]
             boneIndicesData = unpack_ints(m_CompressedMesh.m_BoneIndices)
 
             vertexIndex = 0
@@ -580,14 +579,14 @@ def decompress_compressed_mesh(self):
             boneIndicesIterator = iter(boneIndicesData)
             for weight, boneIndex in zip(weightsData, boneIndicesIterator):
                 # read bone index and weight
-                boneWeights[vertexIndex][j] = weight
+                boneWeights[vertexIndex][j] = weight / 31
                 boneIndices[vertexIndex][j] = boneIndex
 
                 j += 1
                 sum += weight
 
                 # the weights add up to one, continue with the next vertex.
-                if sum >= 1.0:
+                if sum >= 31:
                     j = 4
                     # set weights and boneIndices to 0,
                     # already done on init

UnityPy/helpers/PackedBitVector.py

@@ -1,18 +1,18 @@
-from typing import TYPE_CHECKING, List, Optional, Tuple
+from typing import TYPE_CHECKING, Any, List, Optional, Tuple
 
 if TYPE_CHECKING:
     from ..classes.generated import PackedBitVector
 
 
-def reshape(data: list, shape: Optional[Tuple[int, ...]] = None) -> list:
+def reshape(data: list, shape: Optional[Tuple[int, ...]] = None) -> List[Any]:
     if shape is None:
         return data
     if len(shape) == 1:
         m = shape[0]
         return [data[i : i + m] for i in range(0, len(data), m)]
     elif len(shape) == 2:
         m, n = shape
-        return [[[data[i + j : i + j + n] for j in range(0, m * n, n)]] for i in range(0, len(data), m * n)]
+        return [[data[i + j : i + j + n] for j in range(0, m * n, n)] for i in range(0, len(data), m * n)]
     else:
         raise ValueError("Invalid shape")
 
@@ -22,7 +22,7 @@ def unpack_ints(
     start: int = 0,
     count: Optional[int] = None,
     shape: Optional[Tuple[int, ...]] = None,
-) -> List[int]:
+) -> List[Any]:
     assert packed.m_BitSize is not None
 
     m_BitSize = packed.m_BitSize
@@ -70,13 +70,18 @@ def unpack_floats(
     start: int = 0,
     count: Optional[int] = None,
     shape: Optional[Tuple[int, ...]] = None,
-) -> List[float]:
+) -> List[Any]:
     assert packed.m_BitSize is not None and packed.m_Range is not None and packed.m_Start is not None
 
-    # read as int and cast up to double to prevent loss of precision
-    quantized_f64 = unpack_ints(packed, start, count)
-    scale = packed.m_Range / ((1 << packed.m_BitSize) - 1)
-    quantized = [x * scale + packed.m_Start for x in quantized_f64]
+    # avoid zero division of scale
+    if packed.m_BitSize == 0:
+        quantized = [packed.m_Start] * (packed.m_NumItems if count is None else count)
+    else:
+        # read as int and cast up to double to prevent loss of precision
+        quantized_f64 = unpack_ints(packed, start, count)
+        scale = packed.m_Range / ((1 << packed.m_BitSize) - 1)
+        quantized = [x * scale + packed.m_Start for x in quantized_f64]
+
     return reshape(quantized, shape)