Most of clippy

mwbryant · Apr 21, 2023 · 55100b1 · 55100b1
1 parent 5a87154
commit 55100b1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 wasm/bevy_game*
 wasm/assets
 *.blend
-*.blend1
+*.blend1
+assets/3d/raw/
diff --git a/assets/3d/sign.glb b/assets/3d/sign.glb
diff --git a/src/bin/game.rs b/src/bin/game.rs
@@ -38,7 +38,7 @@ fn main() {
     app.run();
 }
 
-fn setup(mut commands: Commands) {
+fn setup(mut commands: Commands, assets: Res<AssetServer>) {
     // directional 'sun' light
     commands.spawn(DirectionalLightBundle {
         directional_light: DirectionalLight {
@@ -82,6 +82,16 @@ fn setup(mut commands: Commands) {
         Name::new("Player"),
     ));
 
+    commands.spawn((
+        SceneBundle {
+            scene: assets.load("3d/sign.glb#Scene0"),
+            transform: Transform::from_xyz(-2.0, 0.0, 0.0),
+            ..Default::default()
+        },
+        Name::new("Sign"),
+        OverworldEntity,
+    ));
+
     /*
     commands.spawn((
         SpriteBundle {

diff --git a/src/combat/graphic_effects.rs b/src/combat/graphic_effects.rs
@@ -1,5 +1,3 @@
-use bevy_inspector_egui::egui::epaint::text;
-
 use crate::prelude::*;
 
 pub struct GraphicEffectsPlugin;
@@ -27,7 +25,6 @@ fn add_death_animation(mut commands: Commands, mut death_event: EventReader<Deat
 fn projectile_particles(
     mut commands: Commands,
     assets: Res<AssetServer>,
-    mut texture_atlases: ResMut<Assets<TextureAtlas>>,
     projectiles: Query<(Entity, &Transform), With<Projectile>>,
     mut projectile_emitter: Query<
         (
@@ -91,7 +88,6 @@ fn projectile_particles(
 fn spawn_hit_particles(
     mut commands: Commands,
     assets: Res<AssetServer>,
-    mut texture_atlases: ResMut<Assets<TextureAtlas>>,
     mut hit_event: EventReader<HitEvent>,
     target: Query<&Transform>,
 ) {
@@ -123,11 +119,7 @@ fn spawn_hit_particles(
     }
 }
 
-fn spawn_player_win_particles(
-    mut commands: Commands,
-    assets: Res<AssetServer>,
-    mut texture_atlases: ResMut<Assets<TextureAtlas>>,
-) {
+fn spawn_player_win_particles(mut commands: Commands, assets: Res<AssetServer>) {
     let texture_handle = assets.load("my_art/particles.png");
 
     let particle_desc = ParticleDesc {