remove node_primitive_entities from import context

unavi-xyz · Mar 15, 2024 · 9578926 · 9578926
1 parent 6b64106
commit 9578926
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/bevy_gltf_kun/src/import/gltf/document.rs b/bevy_gltf_kun/src/import/gltf/document.rs
@@ -30,7 +30,6 @@ pub struct ImportContext<'a, 'b> {
     pub graph: &'a mut Graph,
     pub load_context: &'a mut LoadContext<'b>,
 
-    pub node_primitive_entities: HashMap<Handle<GltfNode>, Vec<Entity>>,
     pub nodes_handles: HashMap<Node, Handle<GltfNode>>,
     pub skin_matrices: HashMap<Skin, Handle<SkinnedMeshInverseBindposes>>,
     pub materials: HashMap<(Material, bool), Handle<StandardMaterial>>,

diff --git a/bevy_gltf_kun/src/import/gltf/loader.rs b/bevy_gltf_kun/src/import/gltf/loader.rs
@@ -100,7 +100,6 @@ where
                 load_context,
 
                 materials: HashMap::default(),
-                node_primitive_entities: HashMap::default(),
                 nodes_handles: HashMap::default(),
                 skin_matrices: HashMap::default(),
             };

diff --git a/bevy_gltf_kun/src/import/gltf/node.rs b/bevy_gltf_kun/src/import/gltf/node.rs
@@ -32,6 +32,7 @@ pub enum ImportNodeError {
 pub fn import_node<E: BevyImportExtensions<GltfDocument>>(
     context: &mut ImportContext<'_, '_>,
     node_entities: &mut HashMap<Handle<GltfNode>, Entity>,
+    node_primitive_entities: &mut HashMap<Handle<GltfNode>, Vec<Entity>>,
     builder: &mut WorldChildBuilder,
     parent_world_transform: &Transform,
     n: &mut Node,
@@ -81,7 +82,14 @@ pub fn import_node<E: BevyImportExtensions<GltfDocument>>(
 
     ent.with_children(|parent| {
         for c in n.children(context.graph).iter_mut() {
-            match import_node::<E>(context, node_entities, parent, &world_transform, c) {
+            match import_node::<E>(
+                context,
+                node_entities,
+                node_primitive_entities,
+                parent,
+                &world_transform,
+                c,
+            ) {
                 Ok(handle) => children.push(handle),
                 Err(e) => {
                     warn!("Failed to import node: {}", e);
@@ -108,9 +116,7 @@ pub fn import_node<E: BevyImportExtensions<GltfDocument>>(
 
     node_entities.insert(handle.clone(), ent.id());
     context.nodes_handles.insert(*n, handle.clone());
-    context
-        .node_primitive_entities
-        .insert(handle.clone(), primitive_entities);
+    node_primitive_entities.insert(handle.clone(), primitive_entities);
 
     // Load extensions.
     E::import_node(context, &mut ent, *n);

diff --git a/bevy_gltf_kun/src/import/gltf/scene.rs b/bevy_gltf_kun/src/import/gltf/scene.rs
@@ -31,6 +31,7 @@ pub fn import_scene<E: BevyImportExtensions<GltfDocument>>(
     let mut world = World::default();
 
     let mut node_entities = HashMap::<Handle<GltfNode>, Entity>::default();
+    let mut node_primitive_entities = HashMap::<Handle<GltfNode>, Vec<Entity>>::default();
     let mut root_nodes = Vec::new();
 
     world
@@ -40,6 +41,7 @@ pub fn import_scene<E: BevyImportExtensions<GltfDocument>>(
                 match import_node::<E>(
                     context,
                     &mut node_entities,
+                    &mut node_primitive_entities,
                     parent,
                     &Transform::default(),
                     &mut node,
@@ -84,7 +86,7 @@ pub fn import_scene<E: BevyImportExtensions<GltfDocument>>(
             }
 
             let handle = context.nodes_handles.get(&node).unwrap();
-            let primitive_ents = context.node_primitive_entities.get(handle).unwrap();
+            let primitive_ents = node_primitive_entities.get(handle).unwrap();
 
             for entity in primitive_ents {
                 let mut entity = world.entity_mut(*entity);