4847f7e3ad
Remove unnecessary calls to `iter()`/`iter_mut()`.
Mainly updates the use of queries in our code, docs, and examples.
```rust
// From
for _ in list.iter() {
for _ in list.iter_mut() {
// To
for _ in &list {
for _ in &mut list {
```
We already enable the pedantic lint [clippy::explicit_iter_loop](https://rust-lang.github.io/rust-clippy/stable/) inside of Bevy. However, this only warns for a few known types from the standard library.
## Note for reviewers
As you can see the additions and deletions are exactly equal.
Maybe give it a quick skim to check I didn't sneak in a crypto miner, but you don't have to torture yourself by reading every line.
I already experienced enough pain making this PR :)
Co-authored-by: devil-ira <justthecooldude@gmail.com>
75 lines
2.6 KiB
Rust
75 lines
2.6 KiB
Rust
//! Skinned mesh example with mesh and joints data loaded from a glTF file.
|
|
//! Example taken from <https://github.com/KhronosGroup/glTF-Tutorials/blob/master/gltfTutorial/gltfTutorial_019_SimpleSkin.md>
|
|
|
|
use std::f32::consts::PI;
|
|
|
|
use bevy::{pbr::AmbientLight, prelude::*, render::mesh::skinning::SkinnedMesh};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.insert_resource(AmbientLight {
|
|
brightness: 1.0,
|
|
..default()
|
|
})
|
|
.add_startup_system(setup)
|
|
.add_system(joint_animation)
|
|
.run();
|
|
}
|
|
|
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
// Create a camera
|
|
commands.spawn_bundle(Camera3dBundle {
|
|
transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
..default()
|
|
});
|
|
|
|
// Spawn the first scene in `models/SimpleSkin/SimpleSkin.gltf`
|
|
commands.spawn_bundle(SceneBundle {
|
|
scene: asset_server.load("models/SimpleSkin/SimpleSkin.gltf#Scene0"),
|
|
..default()
|
|
});
|
|
}
|
|
|
|
/// The scene hierarchy currently looks somewhat like this:
|
|
///
|
|
/// ```ignore
|
|
/// <Parent entity>
|
|
/// + Mesh node (without `PbrBundle` or `SkinnedMesh` component)
|
|
/// + Skinned mesh entity (with `PbrBundle` and `SkinnedMesh` component, created by glTF loader)
|
|
/// + First joint
|
|
/// + Second joint
|
|
/// ```
|
|
///
|
|
/// In this example, we want to get and animate the second joint.
|
|
/// It is similar to the animation defined in `models/SimpleSkin/SimpleSkin.gltf`.
|
|
fn joint_animation(
|
|
time: Res<Time>,
|
|
parent_query: Query<&Parent, With<SkinnedMesh>>,
|
|
children_query: Query<&Children>,
|
|
mut transform_query: Query<&mut Transform>,
|
|
) {
|
|
// Iter skinned mesh entity
|
|
for skinned_mesh_parent in &parent_query {
|
|
// Mesh node is the parent of the skinned mesh entity.
|
|
let mesh_node_entity = skinned_mesh_parent.get();
|
|
// Get `Children` in the mesh node.
|
|
let mesh_node_children = children_query.get(mesh_node_entity).unwrap();
|
|
|
|
// First joint is the second child of the mesh node.
|
|
let first_joint_entity = mesh_node_children[1];
|
|
// Get `Children` in the first joint.
|
|
let first_joint_children = children_query.get(first_joint_entity).unwrap();
|
|
|
|
// Second joint is the first child of the first joint.
|
|
let second_joint_entity = first_joint_children[0];
|
|
// Get `Transform` in the second joint.
|
|
let mut second_joint_transform = transform_query.get_mut(second_joint_entity).unwrap();
|
|
|
|
second_joint_transform.rotation = Quat::from_axis_angle(
|
|
Vec3::Z,
|
|
0.5 * PI * time.time_since_startup().as_secs_f32().sin(),
|
|
);
|
|
}
|
|
}
|