Skip to content
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

Jump to bottom

[Merged by Bors] - gltf: add a name to nodes without names #4396

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - gltf: add a name to nodes without names #4396

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fed02c
gltf: add a name to nodes without names
mockersf Apr 3, 2022
e3c82d5
change name
mockersf Apr 4, 2022
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
24 changes: 14 additions & 10 deletions crates/bevy_gltf/src/loader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,15 +518,21 @@ async fn load_gltf<'a, 'b>(
Ok(())
}

fn node_name(node: &Node) -> Name {
let name = node
.name()
.map(|s| s.to_string())
.unwrap_or_else(|| format!("GltfNode{}", node.index()));
Name::new(name)
}

fn paths_recur(node: Node, current_path: &[Name], paths: &mut HashMap<usize, Vec<Name>>) {
if let Some(name) = node.name() {
let mut path = current_path.to_owned();
path.push(Name::new(name.to_string()));
for child in node.children() {
paths_recur(child, &path, paths);
}
paths.insert(node.index(), path);
let mut path = current_path.to_owned();
path.push(node_name(&node));
for child in node.children() {
paths_recur(child, &path, paths);
}
paths.insert(node.index(), path);
}

/// Loads a glTF texture as a bevy [`Image`] and returns it together with its label.
Expand Down Expand Up @@ -678,9 +684,7 @@ fn load_node(
Mat4::from_cols_array_2d(&transform.matrix()),
)));

if let Some(name) = gltf_node.name() {
node.insert(Name::new(name.to_string()));
}
node.insert(node_name(gltf_node));

// create camera node
if let Some(camera) = gltf_node.camera() {
Expand Down