Skip to content

Move assets into subfolders #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kristoff3r wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move assets into subfolders #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 assets/Mission Plausible.wav → assets/audio/Mission Plausible.wav
View file
Open in desktop
File renamed without changes.
0 assets/asteroid_explosion.wav → assets/audio/asteroid_explosion.wav
View file
Open in desktop
File renamed without changes.
0 assets/laser.wav → assets/audio/laser.wav
View file
Open in desktop
File renamed without changes.
0 assets/lose.wav → assets/audio/lose.wav
View file
Open in desktop
File renamed without changes.
0 assets/ship_explosion.wav → assets/audio/ship_explosion.wav
View file
Open in desktop
File renamed without changes.
0 assets/start.wav → assets/audio/start.wav
View file
Open in desktop
File renamed without changes.
0 assets/win.wav → assets/audio/win.wav
View file
Open in desktop
File renamed without changes.
0 assets/level.bw → assets/levels/level.bw
View file
Open in desktop
File renamed without changes.
0 assets/jet.particle.ron → assets/particles/jet.particle.ron
View file
Open in desktop
File renamed without changes.
0 assets/starfield.wgsl → assets/shaders/starfield.wgsl
View file
Open in desktop
File renamed without changes.
0 assets/explosion00.png → assets/textures/explosion00.png
View file
Open in desktop
File renamed without changes
0 assets/fire07.png → assets/textures/fire07.png
View file
Open in desktop
File renamed without changes
0 assets/laserRed07.png → assets/textures/laserRed07.png
View file
Open in desktop
File renamed without changes
0 assets/meteorBrown_big1.png → assets/textures/meteorBrown_big1.png
View file
Open in desktop
File renamed without changes
0 assets/playerShip1_green.png → assets/textures/playerShip1_green.png
View file
Open in desktop
File renamed without changes
2 changes: 1 addition & 1 deletion book/src/2-basics/assets.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn load_assets(
asset_server: Res<AssetServer>,
) {
commands.insert_resource(GameAssets {
player_ship: asset_server.load("playerShip1_green.png"),
player_ship: asset_server.load("textures/playerShip1_green.png"),
});
}
```
Expand Down
2 changes: 1 addition & 1 deletion book/src/3-level/loading.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ fn load_assets(
// ...
) {
commands.insert_resource(LoadedLevel {
level: asset_server.load("level.bw"),
level: asset_server.load("levels/level.bw"),
});
// ...
}
Expand Down
2 changes: 1 addition & 1 deletion book/src/5-sound/firing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fn load_assets(
// ...
) {
commands.insert_resource(AudioAssets {
laser: asset_server.load("laser.wav"),
laser: asset_server.load("audio/laser.wav"),
});
// ...
}
Expand Down
28 changes: 14 additions & 14 deletions src/splash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,23 @@ fn switch_to_menu(

fn load_assets(mut commands: Commands, asset_server: Res<AssetServer>) {
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"),
});
}
2 changes: 1 addition & 1 deletion src/starfield.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
}

Expand Down
Loading