mirror of
https://github.com/storytold/texturecraft.git
synced 2026-11-21 15:00:42 +01:00
perf(formats): remove remaining O(N^2) lookups in glTF import and mesh geometry (#720)
This commit is contained in:
1 parent
89252a0ebe
commit
c2632339f8
3 files changed
+38
-5
No files matched your search
@@ -108,6 +108,7 @@ struct Attrs {
|
||||
colors: Vec<Vec4>,
|
||||
color_seen: bool,
|
||||
seen_materials: HashSet<String>,
|
||||
triangles: usize,
|
||||
}
|
||||
|
||||
fn add_part(
|
||||
@@ -123,7 +124,8 @@ fn add_part(
|
||||
if tris.is_empty() {
|
||||
return Ok(());
|
||||
}
|
||||
check_triangles(raw.triangle_count(), tris.len())?;
|
||||
check_triangles(attrs.triangles, tris.len())?;
|
||||
attrs.triangles += tris.len();
|
||||
|
||||
let linear_transform = Mat3::from_mat4(transform);
|
||||
let normal_transform = linear_transform.inverse().transpose();
|
||||
|
||||
@@ -435,14 +435,19 @@ fn geometry(raw: RawMesh) -> Result<(Mesh, Vec<String>, Option<Vec<Vec2>>)> {
|
||||
check_triangles(0, groups.iter().map(|(_, _, g)| g.len() / 3).sum())?;
|
||||
|
||||
let mut mesh = Mesh { positions, ..Mesh::default() };
|
||||
let mut material_ids: HashMap<String, usize> = HashMap::new();
|
||||
let mut groups: Vec<(usize, String, Vec<u32>)> = groups
|
||||
.into_iter()
|
||||
.filter(|(_, _, g)| g.len() >= 3)
|
||||
.map(|(material, part, tris)| {
|
||||
let m = mesh.materials.iter().position(|x| *x == material).unwrap_or(mesh.materials.len());
|
||||
if m == mesh.materials.len() {
|
||||
mesh.materials.push(material);
|
||||
}
|
||||
let m = match material_ids.entry(material) {
|
||||
Entry::Occupied(e) => *e.get(),
|
||||
Entry::Vacant(e) => {
|
||||
let m = mesh.materials.len();
|
||||
mesh.materials.push(e.key().clone());
|
||||
*e.insert(m)
|
||||
}
|
||||
};
|
||||
(m, part, tris)
|
||||
})
|
||||
.collect();
|
||||
|
||||
@@ -714,3 +714,29 @@ fn base_color_filters_hdr_before_clamping_to_eight_bits() {
|
||||
assert_eq!((w, h), expected.dimensions());
|
||||
assert_eq!(actual, expected.pixels().map(|p| p.0).collect::<Vec<_>>());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn duplicate_gltf_material_names_keep_first_wins_and_order() {
|
||||
let mut raw = RawMesh {
|
||||
positions: vec![Vec3::ZERO, Vec3::X, Vec3::Y],
|
||||
base_colors: vec![
|
||||
RawBaseColor { material: "Dup".into(), factor: Vec4::new(1.0, 0.0, 0.0, 1.0), image: None },
|
||||
RawBaseColor { material: "Dup".into(), factor: Vec4::new(0.0, 0.0, 1.0, 1.0), image: None },
|
||||
RawBaseColor { material: "Second".into(), factor: Vec4::new(0.0, 1.0, 0.0, 1.0), image: None },
|
||||
],
|
||||
..RawMesh::default()
|
||||
};
|
||||
raw.group("Dup", "p1").extend_from_slice(&[0, 1, 2]);
|
||||
raw.group("Second", "p2").extend_from_slice(&[0, 1, 2]);
|
||||
raw.group("Dup", "p3").extend_from_slice(&[0, 1, 2]);
|
||||
let colors = std::mem::take(&mut raw.base_colors);
|
||||
let (mesh, _, _) = geometry(raw).unwrap();
|
||||
assert_eq!(mesh.materials, vec!["Dup", "Second"]);
|
||||
let submesh_materials: Vec<_> = mesh.submeshes.iter().map(|s| (s.name.as_str(), s.material)).collect();
|
||||
assert_eq!(submesh_materials, [("p1", 0), ("p3", 0), ("p2", 1)]);
|
||||
let mut color_by_material: HashMap<&str, &RawBaseColor> = HashMap::with_capacity(colors.len());
|
||||
for color in &colors {
|
||||
color_by_material.entry(color.material.as_str()).or_insert(color);
|
||||
}
|
||||
assert_eq!(color_by_material.get("Dup").unwrap().factor, Vec4::new(1.0, 0.0, 0.0, 1.0));
|
||||
}
|
||||
Reference in new issue
Block a user