Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions UnityPy/helpers/MeshHelper.py
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,50 @@ def read_vertex_data(self, m_Channels: list[ChannelInfo], m_Streams: list[Stream
componentBytes[offset : offset + component_byte_size] = item

component_data = list(struct.iter_unpack(f">{channel_dimension}{component_dtype}", componentBytes))
component_data = self.normalize_channel_data(m_Channel, component_data)
self.assign_channel_vertex_data(chn, component_data)

def normalize_channel_data(self, m_Channel: ChannelInfo, component_data: list) -> list:
"""Convert normalized (UNorm/SNorm) channel values to floats.

UNorm values are divided by the format maximum (255 / 65535),
SNorm values by 127 / 32767 and clamped to -1, matching how
compressed meshes and copy_from_mesh already treat colours.
All other formats are returned unchanged.
"""
divisor: Optional[float] = None
signed = False
if self.version[0] < 2017:
# legacy channel formats; only the colour format is normalized
if m_Channel.format == 2: # kChannelFormatColor
divisor = 255.0
elif self.version[0] < 2019:
format = VertexFormat2017(m_Channel.format)
if format in (VertexFormat2017.kVertexFormatColor, VertexFormat2017.kVertexFormatUNorm8):
divisor = 255.0
elif format == VertexFormat2017.kVertexFormatSNorm8:
divisor, signed = 127.0, True
elif format == VertexFormat2017.kVertexFormatUNorm16:
divisor = 65535.0
elif format == VertexFormat2017.kVertexFormatSNorm16:
divisor, signed = 32767.0, True
else:
format = VertexFormat(m_Channel.format)
if format == VertexFormat.kVertexFormatUNorm8:
divisor = 255.0
elif format == VertexFormat.kVertexFormatSNorm8:
divisor, signed = 127.0, True
elif format == VertexFormat.kVertexFormatUNorm16:
divisor = 65535.0
elif format == VertexFormat.kVertexFormatSNorm16:
divisor, signed = 32767.0, True

if divisor is None:
return component_data
if signed:
return [tuple(max(value / divisor, -1.0) for value in vertex) for vertex in component_data]
return [tuple(value / divisor for value in vertex) for vertex in component_data]

def assign_channel_vertex_data(self, channel: int, component_data: list):
if self.version[0] >= 2018:
if channel == 0: # kShaderChannelVertex
Expand Down
80 changes: 80 additions & 0 deletions tests/test_mesh_helper.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
import os
import struct
from types import SimpleNamespace

import pytest

import UnityPy
from UnityPy.classes.generated import (
AABB,
ChannelInfo,
CompressedMesh,
Mesh,
PackedBitVector,
SubMesh,
Vector3f,
VertexData,
)
from UnityPy.export.MeshExporter import export_mesh_obj
from UnityPy.helpers import MeshHelper
from UnityPy.helpers.MeshHelper import MeshHandler

SAMPLES = os.path.join(os.path.dirname(os.path.abspath(__file__)), "samples")
Expand Down Expand Up @@ -39,6 +53,72 @@ def test_mesh_with_empty_submeshes_and_no_indices():
assert triangles(mesh) == [[] for _ in mesh.m_SubMeshes]


def build_normalized_channel_mesh():
# one vertex: Float x3 position, UNorm8 x4 color, UNorm16 x2 uv0, SNorm16 x2 uv1
vertex = struct.pack(
"<3f4B2H2h", 0, 0, 0, 255, 128, 0, 255, 65535, 32768, -32767, 16384
)
# VertexFormat since 2019: 0 Float, 2 UNorm8, 4 UNorm16, 5 SNorm16
channels = [
ChannelInfo(dimension=3, format=0, offset=0, stream=0), # position
ChannelInfo(dimension=0, format=0, offset=0, stream=0), # normal
ChannelInfo(dimension=0, format=0, offset=0, stream=0), # tangent
ChannelInfo(dimension=4, format=2, offset=12, stream=0), # color
ChannelInfo(dimension=2, format=4, offset=16, stream=0), # uv0
ChannelInfo(dimension=2, format=5, offset=20, stream=0), # uv1
]
empty = PackedBitVector(m_Data=[], m_NumItems=0)
names = (
"m_BoneIndices",
"m_NormalSigns",
"m_Normals",
"m_TangentSigns",
"m_Tangents",
"m_Triangles",
"m_UV",
"m_Vertices",
"m_Weights",
)
aabb = AABB(m_Center=Vector3f(0, 0, 0), m_Extent=Vector3f(1, 1, 1))
mesh = Mesh(
m_BindPose=[],
m_CompressedMesh=CompressedMesh(**{name: empty for name in names}),
m_IndexBuffer=[],
m_IndexFormat=0,
m_LocalAABB=aabb,
m_MeshCompression=0,
m_Name="mesh",
m_SubMeshes=[
SubMesh(
firstByte=0,
firstVertex=0,
indexCount=0,
localAABB=aabb,
vertexCount=1,
baseVertex=0,
topology=0,
)
],
m_VertexData=VertexData(m_DataSize=vertex, m_VertexCount=1, m_Channels=channels),
)
mesh.object_reader = SimpleNamespace(version=(2021, 3, 0, 0))
return mesh


@pytest.mark.parametrize("use_boost", [True, False])
def test_normalized_vertex_channels_are_returned_as_floats(monkeypatch, use_boost):
if not use_boost:
monkeypatch.setattr(MeshHelper, "UnityPyBoost", None)
mesh = build_normalized_channel_mesh()
handler = MeshHandler(mesh)
handler.process()
assert handler.m_Colors == [(1.0, 128 / 255, 0.0, 1.0)]
assert handler.m_UV0 == [(1.0, 32768 / 65535)]
assert handler.m_UV1 == [(-1.0, 16384 / 32767)]
obj = export_mesh_obj(mesh)
assert "vt 65535 32768" not in obj


def test_mesh_with_submesh_indices_but_no_index_buffer():
mesh = load_mesh()
assert any(submesh.indexCount for submesh in mesh.m_SubMeshes)
Expand Down