remove unused assets

nolanking90 · Sep 17, 2024 · dc31222 · dc31222
1 parent e92cd40
commit dc31222
Show file tree

Hide file tree

Showing 26 changed files with 25 additions and 12 deletions.
diff --git a/assets/.DS_Store b/assets/.DS_Store
diff --git a/assets/1085.png b/assets/1085.png
diff --git a/assets/1086.png b/assets/1086.png
diff --git a/assets/1087.png b/assets/1087.png
diff --git a/assets/1088.png b/assets/1088.png
diff --git a/assets/1089.png b/assets/1089.png
diff --git a/assets/1090.png b/assets/1090.png
diff --git a/assets/1091.png b/assets/1091.png
diff --git a/assets/1092.png b/assets/1092.png
diff --git a/assets/1093.png b/assets/1093.png
diff --git a/assets/1094.png b/assets/1094.png
diff --git a/assets/1095.png b/assets/1095.png
diff --git a/assets/1096.png b/assets/1096.png
diff --git a/assets/1097.png b/assets/1097.png
diff --git a/assets/1098.png b/assets/1098.png
diff --git a/assets/1099.png b/assets/1099.png
diff --git a/assets/1100.png b/assets/1100.png
diff --git a/assets/1101.png b/assets/1101.png
diff --git a/assets/1102.png b/assets/1102.png
diff --git a/assets/1103.png b/assets/1103.png
diff --git a/assets/1145.png b/assets/1145.png
diff --git a/assets/1149.png b/assets/1149.png
diff --git a/assets/68.png b/assets/68.png
diff --git a/src/car.rs b/src/car.rs
@@ -28,15 +28,10 @@ pub enum CarState {
 
 pub fn spawn_car(
     mut commands: Commands,
-    asset_server: Res<AssetServer>,
     window: Query<&Window>,
     level_assets: Query<&LevelAssets>,
 ) {
     let window_scale = 1080.0 / window.single().height();
-    let mut texture_list: Vec<Handle<Image>> = Vec::new();
-    for n in 0..20 {
-        texture_list.push(asset_server.load((1084 + n).to_string() + ".png"));
-    }
 
     commands.spawn((
         SpriteBundle {

diff --git a/src/levels.rs b/src/levels.rs
@@ -1,5 +1,4 @@
-use crate::car::*;
-use crate::menu::*;
+use crate::{car::*, menu::*, Background, Obstacle};
 use crate::CameraMarker;
 use bevy::prelude::*;
 
@@ -94,11 +93,12 @@ pub fn next_level(
 pub fn load_level(
     mut commands: Commands,
     level: Res<Level>,
-    level_assets: Query<Entity, With<LevelAssets>>,
+    assets: Query<(Entity, AnyOf<(&LevelAssets, &Background, &Obstacle)>)>,
     mut next_state: ResMut<NextState<GameState>>,
     asset_server: Res<AssetServer>,
+
 ) {
-    level_assets.iter().for_each(|lvl| { commands.entity(lvl).despawn(); });
+    assets.iter().for_each(|a| { commands.entity(a.0).despawn(); });
     match level.level {
         1 => {
             commands.spawn(LevelAssets {
@@ -119,7 +119,25 @@ pub fn load_level(
                 background_texture: asset_server.load("1058.png"),
             });
         }
-        2 => {}
+        2 => {
+            commands.spawn(LevelAssets {
+                obstacle_height: 291.0,
+                obstacle_width: 202.0,
+                obstacle_speed: 0.0,
+                obstacle_texture: vec![
+                    asset_server.load("1149.png"),
+                    asset_server.load("1149.png"),
+                ],
+                y_values: [
+                    (105.0 / 2.0 + 20.0),
+                    (135.0 + 105.0 / 2.0 + 10.0),
+                    (2.0 * 135.0 + 105.0 / 2.0 + 15.0),
+                    (3.0 * 135.0 + 105.0 / 2.0 - 10.0),
+                ],
+                car_texture: asset_server.load("1145.png"),
+                background_texture: asset_server.load("backroads.png"),
+            });
+        }
         3 => {}
         _ => {}
     }

diff --git a/src/main.rs b/src/main.rs
@@ -39,7 +39,7 @@ fn main() {
         //.add_plugins(WorldInspectorPlugin::new())
         .add_systems(Startup, spawn_ui)
         .add_systems(Startup, spawn_score)
-        .add_systems(Startup, spawn_menu)
+        //.add_systems(Startup, spawn_menu)
         .add_systems(Update, update_menu)
         .add_systems(Update, update_score.run_if(in_state(GameState::Running)))
         .add_systems(Update, camera_tracking.run_if(in_state(GameState::Running)))
@@ -55,7 +55,7 @@ fn main() {
         .add_systems(Update, load_level.run_if(in_state(GameState::LoadNextLevel)))
 
         .add_systems(Update, update_background.run_if(in_state(GameState::Running)))
-        .add_systems(FixedUpdate, update_car.run_if(in_state(GameState::Running)))
+        .add_systems(Update, update_car.run_if(in_state(GameState::Running)))
         .add_systems(Update, update_obstacles.run_if(in_state(GameState::Running)))
         .add_systems(Update, spawn_new_obstacles.after(update_obstacles))
         .add_systems(Update, detect_collision.run_if(in_state(GameState::Running)))