Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-10 07:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle empty morph weights when loading gltf (#9867)

Browse source 
# Objective

Fixes https://github.com/bevyengine/bevy/issues/9863.

## Solution

Spawn `MorphWeights` after we handle `MeshMorphWeights` for the
children.
This commit is contained in:
floppyhammer 2023-09-21 01:40:00 +08:00 committed by GitHub
parent 038d11329c
commit 354a5b7933
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
crates/bevy_gltf/src/loader.rs
View file

@ -810,18 +810,7 @@ fn load_node(
// Map node index to entity // Map node index to entity
node_index_to_entity_map.insert(gltf_node.index(), node.id()); node_index_to_entity_map.insert(gltf_node.index(), node.id());
if let Some(mesh) = gltf_node.mesh() { let mut morph_weights = None;
if let Some(weights) = mesh.weights() {
let first_mesh = if let Some(primitive) = mesh.primitives().next() {
let primitive_label = primitive_label(&mesh, &primitive);
let handle: Handle<Mesh> = load_context.get_label_handle(&primitive_label);
Some(handle)
} else {
None
};
node.insert(MorphWeights::new(weights.to_vec(), first_mesh)?);
}
};
node.with_children(|parent| { node.with_children(|parent| {
if let Some(mesh) = gltf_node.mesh() { if let Some(mesh) = gltf_node.mesh() {
@ -853,6 +842,11 @@ fn load_node(
Some(weights) => weights.to_vec(), Some(weights) => weights.to_vec(),
None => vec![0.0; target_count], None => vec![0.0; target_count],
}; };
if morph_weights.is_none() {
morph_weights = Some(weights.clone());
}
// unwrap: the parent's call to `MeshMorphWeights::new` // unwrap: the parent's call to `MeshMorphWeights::new`
// means this code doesn't run if it returns an `Err`. // means this code doesn't run if it returns an `Err`.
// According to https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#morph-targets // According to https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#morph-targets
@ -972,6 +966,13 @@ fn load_node(
} }
} }
}); });
if let (Some(mesh), Some(weights)) = (gltf_node.mesh(), morph_weights) {
let primitive_label = mesh.primitives().next().map(|p| primitive_label(&mesh, &p));
let first_mesh = primitive_label.map(|label| load_context.get_label_handle(label));
node.insert(MorphWeights::new(weights, first_mesh)?);
}
if let Some(err) = gltf_error { if let Some(err) = gltf_error {
Err(err) Err(err)
} else { } else {