From 1e72ed79c39e33951904b5d47c19fada96e7282e Mon Sep 17 00:00:00 2001 From: FredApps Date: Fri, 13 Nov 2026 11:22:29 +0100 Subject: [PATCH] Ignore repeated FBX geometry connections --- crates/formats/src/mesh_import/fbx.rs | 3 +++ crates/formats/src/mesh_import/scene_tests.rs | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/crates/formats/src/mesh_import/fbx.rs b/crates/formats/src/mesh_import/fbx.rs index 5e975ba2..44e5a79d 100644 --- a/crates/formats/src/mesh_import/fbx.rs +++ b/crates/formats/src/mesh_import/fbx.rs @@ -542,6 +542,9 @@ fn read_inner(bytes: &[u8], files: &mut Files) -> Result { attribute_of.insert(parent, *a); } } + // Repeated connections describe the same instance; keep distinct model placements in order. + let mut seen_instances = HashSet::new(); + instances.retain(|instance| seen_instances.insert(instance.clone())); let placed: HashSet<&String> = instances.iter().map(|(g, _)| g).collect(); let mut unplaced: Vec = geometries.keys().filter(|g| !placed.contains(g)).cloned().collect(); unplaced.sort_unstable(); diff --git a/crates/formats/src/mesh_import/scene_tests.rs b/crates/formats/src/mesh_import/scene_tests.rs index 09515423..a5a86c4f 100644 --- a/crates/formats/src/mesh_import/scene_tests.rs +++ b/crates/formats/src/mesh_import/scene_tests.rs @@ -415,6 +415,24 @@ fn fbx_ascii_and_z_up() { check_fbx_scene(&import_mesh_bytes("z.fbx", &binary_fbx(&scene(true), 7700, true)).unwrap().mesh, true); } +#[test] +fn fbx_duplicate_geometry_connections_do_not_duplicate_instances() { + let mut nodes = scene(false); + let connections = nodes.iter_mut().find(|node| node.name == "Connections").unwrap(); + for _ in 0..50 { + connections.children.push(n("C", vec![P::S("OO"), P::L(10), P::L(21)], vec![])); + } + let imported = import_mesh_bytes("scene.fbx", ascii_fbx(&nodes).as_bytes()).unwrap(); + assert_eq!(imported.report.triangles, 3); + + let objects = nodes.iter_mut().find(|node| node.name == "Objects").unwrap(); + objects.children.push(n("Model", vec![P::L(22), P::S("Other\u{0}\u{1}Model"), P::S("Mesh")], vec![])); + let connections = nodes.iter_mut().find(|node| node.name == "Connections").unwrap(); + connections.children.push(n("C", vec![P::S("OO"), P::L(10), P::L(22)], vec![])); + let imported = import_mesh_bytes("scene.fbx", ascii_fbx(&nodes).as_bytes()).unwrap(); + assert_eq!(imported.report.triangles, 6, "a different model must remain a distinct instance"); +} + /// The scene of [`scene`] (Y up) as FBX 6.1 writes it: geometry inside the Model, objects named /// `Class::Name`, `Properties60`, `Connect` records, GlobalSettings inside Objects. const FBX61: &str = r#"; FBX 6.1.0 project file