From f4dd0e59a52aed3e59159810ee23fbf278410903 Mon Sep 17 00:00:00 2001 From: "kaosat.dev" Date: Thu, 18 Jul 2024 23:34:10 +0200 Subject: [PATCH] chore(): a bit of cargo fmt --- .../src/spawn_from_blueprints.rs | 2 +- .../animation/src/game/in_game.rs | 33 ++++++++++--------- examples/common_rapier/src/physics/utils.rs | 1 - examples/common_xpbd/src/physics/utils.rs | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/crates/bevy_gltf_blueprints/src/spawn_from_blueprints.rs b/crates/bevy_gltf_blueprints/src/spawn_from_blueprints.rs index 278c83a..8c2a94d 100644 --- a/crates/bevy_gltf_blueprints/src/spawn_from_blueprints.rs +++ b/crates/bevy_gltf_blueprints/src/spawn_from_blueprints.rs @@ -296,7 +296,7 @@ pub(crate) fn spawn_from_blueprints( Animations { named_animations, named_indices, - graph + graph, }, Spawned, OriginalChildren(original_children), diff --git a/examples/bevy_gltf_blueprints/animation/src/game/in_game.rs b/examples/bevy_gltf_blueprints/animation/src/game/in_game.rs index c8d2a2b..05a94a9 100644 --- a/examples/bevy_gltf_blueprints/animation/src/game/in_game.rs +++ b/examples/bevy_gltf_blueprints/animation/src/game/in_game.rs @@ -108,15 +108,15 @@ pub fn animation_change_on_proximity_foxes( anim_name = "Survey"; } // now play the animation based on the chosen animation name - let (mut animation_player, mut animation_transitions) = animation_players.get_mut(link.0).unwrap(); + let (mut animation_player, mut animation_transitions) = + animation_players.get_mut(link.0).unwrap(); animation_transitions .play( &mut animation_player, *animations .named_indices .get(anim_name) - .expect("animation name should be in the list") - , + .expect("animation name should be in the list"), Duration::from_secs(3), ) .repeat(); @@ -147,15 +147,15 @@ pub fn animation_change_on_proximity_robots( } // now play the animation based on the chosen animation name - let (mut animation_player, mut animation_transitions) = animation_players.get_mut(link.0).unwrap(); + let (mut animation_player, mut animation_transitions) = + animation_players.get_mut(link.0).unwrap(); animation_transitions .play( &mut animation_player, *animations .named_indices .get(anim_name) - .expect("animation name should be in the list") - , + .expect("animation name should be in the list"), Duration::from_secs(3), ) .repeat(); @@ -175,7 +175,8 @@ pub fn animation_control( // robots if keycode.just_pressed(KeyCode::KeyB) { for (link, animations) in animated_enemies.iter() { - let (mut animation_player, mut animation_transitions) = animation_players.get_mut(link.0).unwrap(); + let (mut animation_player, mut animation_transitions) = + animation_players.get_mut(link.0).unwrap(); let anim_name = "Scan"; animation_transitions .play( @@ -183,8 +184,7 @@ pub fn animation_control( *animations .named_indices .get(anim_name) - .expect("animation name should be in the list") - , + .expect("animation name should be in the list"), Duration::from_secs(5), ) .repeat(); @@ -194,7 +194,8 @@ pub fn animation_control( // foxes if keycode.just_pressed(KeyCode::KeyW) { for (link, animations) in animated_foxes.iter() { - let (mut animation_player, mut animation_transitions) = animation_players.get_mut(link.0).unwrap(); + let (mut animation_player, mut animation_transitions) = + animation_players.get_mut(link.0).unwrap(); let anim_name = "Walk"; animation_transitions .play( @@ -211,7 +212,8 @@ pub fn animation_control( if keycode.just_pressed(KeyCode::KeyX) { for (link, animations) in animated_foxes.iter() { - let (mut animation_player, mut animation_transitions) = animation_players.get_mut(link.0).unwrap(); + let (mut animation_player, mut animation_transitions) = + animation_players.get_mut(link.0).unwrap(); let anim_name = "Run"; animation_transitions .play( @@ -219,8 +221,7 @@ pub fn animation_control( *animations .named_indices .get(anim_name) - .expect("animation name should be in the list") - , + .expect("animation name should be in the list"), Duration::from_secs(5), ) .repeat(); @@ -229,7 +230,8 @@ pub fn animation_control( if keycode.just_pressed(KeyCode::KeyC) { for (link, animations) in animated_foxes.iter() { - let (mut animation_player, mut animation_transitions) = animation_players.get_mut(link.0).unwrap(); + let (mut animation_player, mut animation_transitions) = + animation_players.get_mut(link.0).unwrap(); let anim_name = "Survey"; animation_transitions .play( @@ -237,8 +239,7 @@ pub fn animation_control( *animations .named_indices .get(anim_name) - .expect("animation name should be in the list") - , + .expect("animation name should be in the list"), Duration::from_secs(5), ) .repeat(); diff --git a/examples/common_rapier/src/physics/utils.rs b/examples/common_rapier/src/physics/utils.rs index 2a3c0b7..98b8cbf 100644 --- a/examples/common_rapier/src/physics/utils.rs +++ b/examples/common_rapier/src/physics/utils.rs @@ -3,7 +3,6 @@ use bevy::render::mesh::PrimitiveTopology; // TAKEN VERBATIB FROM https://github.com/janhohenheim/foxtrot/blob/src/util/trait_extension.rs pub(crate) trait MeshExt { - fn search_in_children<'a>( parent: Entity, children: &'a Query<&Children>, diff --git a/examples/common_xpbd/src/physics/utils.rs b/examples/common_xpbd/src/physics/utils.rs index 8fde971..98b8cbf 100644 --- a/examples/common_xpbd/src/physics/utils.rs +++ b/examples/common_xpbd/src/physics/utils.rs @@ -47,4 +47,4 @@ impl MeshExt for Mesh { Vec::new() } } -} \ No newline at end of file +}