diff --git a/assets/Mission Plausible.wav b/assets/audio/Mission Plausible.wav similarity index 100% rename from assets/Mission Plausible.wav rename to assets/audio/Mission Plausible.wav diff --git a/assets/asteroid_explosion.wav b/assets/audio/asteroid_explosion.wav similarity index 100% rename from assets/asteroid_explosion.wav rename to assets/audio/asteroid_explosion.wav diff --git a/assets/laser.wav b/assets/audio/laser.wav similarity index 100% rename from assets/laser.wav rename to assets/audio/laser.wav diff --git a/assets/lose.wav b/assets/audio/lose.wav similarity index 100% rename from assets/lose.wav rename to assets/audio/lose.wav diff --git a/assets/ship_explosion.wav b/assets/audio/ship_explosion.wav similarity index 100% rename from assets/ship_explosion.wav rename to assets/audio/ship_explosion.wav diff --git a/assets/start.wav b/assets/audio/start.wav similarity index 100% rename from assets/start.wav rename to assets/audio/start.wav diff --git a/assets/win.wav b/assets/audio/win.wav similarity index 100% rename from assets/win.wav rename to assets/audio/win.wav diff --git a/assets/level.bw b/assets/levels/level.bw similarity index 100% rename from assets/level.bw rename to assets/levels/level.bw diff --git a/assets/jet.particle.ron b/assets/particles/jet.particle.ron similarity index 100% rename from assets/jet.particle.ron rename to assets/particles/jet.particle.ron diff --git a/assets/starfield.wgsl b/assets/shaders/starfield.wgsl similarity index 100% rename from assets/starfield.wgsl rename to assets/shaders/starfield.wgsl diff --git a/assets/explosion00.png b/assets/textures/explosion00.png similarity index 100% rename from assets/explosion00.png rename to assets/textures/explosion00.png diff --git a/assets/fire07.png b/assets/textures/fire07.png similarity index 100% rename from assets/fire07.png rename to assets/textures/fire07.png diff --git a/assets/laserRed07.png b/assets/textures/laserRed07.png similarity index 100% rename from assets/laserRed07.png rename to assets/textures/laserRed07.png diff --git a/assets/meteorBrown_big1.png b/assets/textures/meteorBrown_big1.png similarity index 100% rename from assets/meteorBrown_big1.png rename to assets/textures/meteorBrown_big1.png diff --git a/assets/playerShip1_green.png b/assets/textures/playerShip1_green.png similarity index 100% rename from assets/playerShip1_green.png rename to assets/textures/playerShip1_green.png diff --git a/book/src/2-basics/assets.md b/book/src/2-basics/assets.md index 3736d83..1788d37 100644 --- a/book/src/2-basics/assets.md +++ b/book/src/2-basics/assets.md @@ -19,7 +19,7 @@ fn load_assets( asset_server: Res, ) { commands.insert_resource(GameAssets { - player_ship: asset_server.load("playerShip1_green.png"), + player_ship: asset_server.load("textures/playerShip1_green.png"), }); } ``` diff --git a/book/src/3-level/loading.md b/book/src/3-level/loading.md index b249f32..38e55ae 100644 --- a/book/src/3-level/loading.md +++ b/book/src/3-level/loading.md @@ -143,7 +143,7 @@ fn load_assets( // ... ) { commands.insert_resource(LoadedLevel { - level: asset_server.load("level.bw"), + level: asset_server.load("levels/level.bw"), }); // ... } diff --git a/book/src/5-sound/firing.md b/book/src/5-sound/firing.md index 2b9d41e..124b045 100644 --- a/book/src/5-sound/firing.md +++ b/book/src/5-sound/firing.md @@ -18,7 +18,7 @@ fn load_assets( // ... ) { commands.insert_resource(AudioAssets { - laser: asset_server.load("laser.wav"), + laser: asset_server.load("audio/laser.wav"), }); // ... } diff --git a/src/splash.rs b/src/splash.rs index b2853b0..2770d93 100644 --- a/src/splash.rs +++ b/src/splash.rs @@ -63,23 +63,23 @@ fn switch_to_menu( fn load_assets(mut commands: Commands, asset_server: Res) { commands.insert_resource(GameAssets { - player_ship: asset_server.load("playerShip1_green.png"), - asteroid: asset_server.load("meteorBrown_big1.png"), - jets: asset_server.load("fire07.png"), - explosion: asset_server.load("explosion00.png"), - laser: asset_server.load("laserRed07.png"), - jet_particles: asset_server.load("jet.particle.ron"), + player_ship: asset_server.load("textures/playerShip1_green.png"), + asteroid: asset_server.load("textures/meteorBrown_big1.png"), + jets: asset_server.load("textures/fire07.png"), + explosion: asset_server.load("textures/explosion00.png"), + laser: asset_server.load("textures/laserRed07.png"), + jet_particles: asset_server.load("particles/jet.particle.ron"), }); commands.insert_resource(LoadedLevel { - level: asset_server.load("level.bw"), + level: asset_server.load("levels/level.bw"), }); commands.insert_resource(AudioAssets { - laser: asset_server.load("laser.wav"), - ship_explosion: asset_server.load("ship_explosion.wav"), - asteroid_explosion: asset_server.load("asteroid_explosion.wav"), - start: asset_server.load("start.wav"), - win: asset_server.load("win.wav"), - lose: asset_server.load("lose.wav"), - game_loop: asset_server.load("Mission Plausible.wav"), + laser: asset_server.load("audio/laser.wav"), + ship_explosion: asset_server.load("audio/ship_explosion.wav"), + asteroid_explosion: asset_server.load("audio/asteroid_explosion.wav"), + start: asset_server.load("audio/start.wav"), + win: asset_server.load("audio/win.wav"), + lose: asset_server.load("audio/lose.wav"), + game_loop: asset_server.load("audio/Mission Plausible.wav"), }); } diff --git a/src/starfield.rs b/src/starfield.rs index b195bc4..cbec84a 100644 --- a/src/starfield.rs +++ b/src/starfield.rs @@ -32,7 +32,7 @@ impl<'a> From<&'a StarfieldMaterial> for StarfieldMaterial { impl Material2d for StarfieldMaterial { fn fragment_shader() -> bevy::render::render_resource::ShaderRef { - ShaderRef::Path("starfield.wgsl".into()) + ShaderRef::Path("shaders/starfield.wgsl".into()) } }