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] - add AnimationPlayer component only on scene roots that are also animation roots #4417

Closed
wants to merge 3 commits into from
Closed

[Merged by Bors] - add AnimationPlayer component only on scene roots that are also animation roots #4417

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d0911e
add AnimationPlayer component only on scene roots that are also anima…
mockersf Apr 4, 2022
ce11a54
clippy :heart:
mockersf Apr 4, 2022
117d338
keep the root node index for animations
mockersf Apr 5, 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
38 changes: 26 additions & 12 deletions crates/bevy_gltf/src/loader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,19 +130,21 @@ async fn load_gltf<'a, 'b>(

#[cfg(feature = "bevy_animation")]
let paths = {
let mut paths = HashMap::<usize, Vec<Name>>::new();
let mut paths = HashMap::<usize, (usize, Vec<Name>)>::new();
for scene in gltf.scenes() {
for node in scene.nodes() {
paths_recur(node, &[], &mut paths);
let root_index = node.index();
paths_recur(node, &[], &mut paths, root_index);
}
}
paths
};

#[cfg(feature = "bevy_animation")]
let (animations, named_animations) = {
let (animations, named_animations, animation_roots) = {
let mut animations = vec![];
let mut named_animations = HashMap::default();
let mut animation_roots = HashSet::default();
for animation in gltf.animations() {
let mut animation_clip = AnimationClip::default();
for channel in animation.channels() {
Expand Down Expand Up @@ -189,7 +191,8 @@ async fn load_gltf<'a, 'b>(
return Err(GltfError::MissingAnimationSampler(animation.index()));
};

if let Some(path) = paths.get(&node.index()) {
if let Some((root_index, path)) = paths.get(&node.index()) {
animation_roots.insert(root_index);
animation_clip.add_curve_to_path(
EntityPath {
parts: path.clone(),
Expand All @@ -215,7 +218,7 @@ async fn load_gltf<'a, 'b>(
}
animations.push(handle);
}
(animations, named_animations)
(animations, named_animations, animation_roots)
};

let mut meshes = vec![];
Expand Down Expand Up @@ -467,10 +470,16 @@ async fn load_gltf<'a, 'b>(
}

#[cfg(feature = "bevy_animation")]
if !animations.is_empty() {
world
.entity_mut(*node_index_to_entity_map.get(&0).unwrap())
.insert(AnimationPlayer::default());
{
// for each node root in a scene, check if it's the root of an animation
// if it is, add the AnimationPlayer component
for node in scene.nodes() {
if animation_roots.contains(&node.index()) {
world
.entity_mut(*node_index_to_entity_map.get(&node.index()).unwrap())
.insert(AnimationPlayer::default());
}
}
}

for (&entity, &skin_index) in &entity_to_skin_index_map {
Expand Down Expand Up @@ -526,13 +535,18 @@ fn node_name(node: &Node) -> Name {
Name::new(name)
}

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

/// Loads a glTF texture as a bevy [`Image`] and returns it together with its label.
Expand Down