From deaac7df55a6d8ea6c15e50a0985552e293629cc Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 18 Nov 2026 13:55:52 -0500 Subject: [PATCH] fix(geom): avoid unnecessary tangent face allocation --- crates/geom/src/mesh.rs | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/crates/geom/src/mesh.rs b/crates/geom/src/mesh.rs index 5e53b3db..0c562e48 100644 --- a/crates/geom/src/mesh.rs +++ b/crates/geom/src/mesh.rs @@ -225,6 +225,11 @@ impl Mesh { /// buffers are untouched; only tangent generation looks at the quads. fn tangent_faces(&self) -> Vec { let triangles = self.indices.len() / 3; + // An empty face table keeps the original constant-space triangle adapter. + // Do not allocate a per-triangle table unless a valid quad needs one. + if !self.diagonals.contains(&QUAD_FIRST_MARK) || !(0..triangles).any(|t| self.quad_at(t).is_some()) { + return Vec::new(); + } let mut faces = Vec::with_capacity(triangles); let mut t = 0; while t < triangles { @@ -285,11 +290,14 @@ impl Mesh { self.uvs = vec![Vec2::ZERO; self.positions.len()]; } // mikktspace crashes (out-of-bounds) when every triangle is degenerate; skip it then. - let usable = !crate::unwrap::all_triangles_degenerate(self); - let faces = self.tangent_faces(); - let mut g = Mikk { mesh: self, faces }; - if !usable || !mikktspace::generate_tangents(&mut g) { + if crate::unwrap::all_triangles_degenerate(self) { self.simple_tangents(); + } else { + let faces = self.tangent_faces(); + let mut g = Mikk { mesh: self, faces }; + if !mikktspace::generate_tangents(&mut g) { + self.simple_tangents(); + } } for (t, n) in self.tangents.iter_mut().zip(&self.normals) { // Orthonormalize against the normal; repair degenerate results. @@ -478,13 +486,17 @@ struct Mikk<'a> { impl Mikk<'_> { fn vi(&self, face: usize, vert: usize) -> usize { - self.faces.get(face).and_then(|f| f.corners.get(vert)).copied().unwrap_or(0) as usize + if self.faces.is_empty() { + self.mesh.indices.get(face * 3 + vert).copied().unwrap_or(0) as usize + } else { + self.faces.get(face).and_then(|f| f.corners.get(vert)).copied().unwrap_or(0) as usize + } } } impl mikktspace::Geometry for Mikk<'_> { fn num_faces(&self) -> usize { - self.faces.len() + if self.faces.is_empty() { self.mesh.indices.len() / 3 } else { self.faces.len() } } fn num_vertices_of_face(&self, face: usize) -> usize { self.faces.get(face).map_or(3, |f| f.count) @@ -513,6 +525,19 @@ impl mikktspace::Geometry for Mikk<'_> { mod tests { use super::*; + #[test] + fn unmarked_and_invalid_quad_meshes_need_no_face_table() { + let mut mesh = quad(); + assert_eq!(mesh.tangent_faces().capacity(), 0); + mesh.diagonals = vec![QUAD_FIRST_MARK, QUAD_SECOND_MARK]; + assert_eq!(mesh.tangent_faces().len(), 1); + mesh.positions.fill(Vec3::ZERO); + mesh.normals.fill(Vec3::X); + assert_eq!(mesh.tangent_faces().capacity(), 0); + mesh.compute_tangents(); + assert!(mesh.tangents.iter().all(|t| t.is_finite() && t.truncate().dot(Vec3::X).abs() < 1e-6)); + } + fn quad() -> Mesh { Mesh::from_parts( vec![Vec3::new(0.0, 0.0, 0.0), Vec3::new(1.0, 0.0, 0.0), Vec3::new(1.0, 1.0, 0.0), Vec3::new(0.0, 1.0, 0.0)],