Skip to content

Correctly export vertex normals #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 12, 2025
Merged

Correctly export vertex normals #434

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30d2a30
Improve normals export
Jrius Jan 9, 2025
b1d0465
Normals: performance improvement
Jrius Jan 12, 2025
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
22 changes: 11 additions & 11 deletions korman/exporter/mesh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,10 +394,12 @@ def _export_geometry(self, bo, mesh, materials, geospans, mat2span_LUT):
continue

face_verts = []
use_smooth = tessface.use_smooth
dPosDu = hsVector3(0.0, 0.0, 0.0)
dPosDv = hsVector3(0.0, 0.0, 0.0)

# Unpack normals
tessface_normals = [tuple(n) for n in tessface.split_normals]

# Unpack the UV coordinates from each UV Texture layer
# NOTE: Blender has no third (W) coordinate
tessface_uvws = [uvtex.data[i].uv for uvtex in mesh.tessface_uv_textures]
Expand Down Expand Up @@ -446,6 +448,7 @@ def _export_geometry(self, bo, mesh, materials, geospans, mat2span_LUT):

# Convert to per-material indices
for j, vertex in enumerate(tessface.vertices):
vertex_normal = tessface_normals[j]
uvws = tuple([tuple(uvw[j]) for uvw in tessface_uvws])

# Calculate vertex colors.
Expand All @@ -462,18 +465,14 @@ def _export_geometry(self, bo, mesh, materials, geospans, mat2span_LUT):
# Now, we'll index into the vertex dict using the per-face elements :(
# We're using tuples because lists are not hashable. The many mathutils and PyHSPlasma
# types are not either, and it's entirely too much work to fool with all that.
coluv = (vertex_color, uvws)
if coluv not in data.blender2gs[vertex]:
normcoluv = (vertex_normal, vertex_color, uvws)
if normcoluv not in data.blender2gs[vertex]:
source = mesh.vertices[vertex]
geoVertex = plGeometrySpan.TempVertex()
geoVertex.position = hsVector3(*source.co)

# If this face has smoothing, use the vertex normal
# Otherwise, use the face normal
normal = source.normal if use_smooth else tessface.normal

# MOUL/DX9 craps its pants if any element of the normal is exactly 0.0
normal = map(lambda x: max(x, 0.01) if x >= 0.0 else min(x, -0.01), normal)
normal = map(lambda x: max(x, 0.01) if x >= 0.0 else min(x, -0.01), vertex_normal)
normal = hsVector3(*normal)
normal.normalize()
geoVertex.normal = normal
Expand All @@ -486,15 +485,15 @@ def _export_geometry(self, bo, mesh, materials, geospans, mat2span_LUT):
geoVertex.uvs = uvs

idx = len(data.vertices)
data.blender2gs[vertex][coluv] = idx
data.blender2gs[vertex][normcoluv] = idx
data.vertices.append(geoVertex)
face_verts.append(idx)
else:
# If we have a bump mapping layer, then we need to add the bump gradients for
# this face to the vertex's magic channels
if bumpmap is not None:
num_user_uvs = len(uvws)
geoVertex = data.vertices[data.blender2gs[vertex][coluv]]
geoVertex = data.vertices[data.blender2gs[vertex][normcoluv]]

# Unfortunately, PyHSPlasma returns a copy of everything. Previously, editing
# in place would result in silent failures; however, as of python_refactor,
Expand All @@ -503,7 +502,7 @@ def _export_geometry(self, bo, mesh, materials, geospans, mat2span_LUT):
geoUVs[num_user_uvs] += dPosDu
geoUVs[num_user_uvs+1] += dPosDv
geoVertex.uvs = geoUVs
face_verts.append(data.blender2gs[vertex][coluv])
face_verts.append(data.blender2gs[vertex][normcoluv])

# Convert to triangles, if need be...
num_faces = len(face_verts)
Expand Down Expand Up @@ -614,6 +613,7 @@ def _export_object(self, bo):
return self._export_mesh(bo, mesh)

def _export_mesh(self, bo, mesh):
mesh.calc_normals_split()
mesh.calc_tessface()

# Step 0.8: Determine materials needed for export... Three considerations here:
Expand Down