From 5ec0ad0da41222467bf715edb32659b6624e4d81 Mon Sep 17 00:00:00 2001 From: crumblingstatue Date: Sat, 15 Apr 2023 16:14:49 +0200 Subject: [PATCH] Put music and graphics in different folders --- res/{ => graphics}/light2.png | Bin res/{ => graphics}/tiles.png | Bin res/{ => music}/cave.ogg | Bin res/{ => music}/cave2.ogg | Bin res/{ => music}/music.ogg | Bin src/res.rs | 8 ++++---- 6 files changed, 4 insertions(+), 4 deletions(-) rename res/{ => graphics}/light2.png (100%) rename res/{ => graphics}/tiles.png (100%) rename res/{ => music}/cave.ogg (100%) rename res/{ => music}/cave2.ogg (100%) rename res/{ => music}/music.ogg (100%) diff --git a/res/light2.png b/res/graphics/light2.png similarity index 100% rename from res/light2.png rename to res/graphics/light2.png diff --git a/res/tiles.png b/res/graphics/tiles.png similarity index 100% rename from res/tiles.png rename to res/graphics/tiles.png diff --git a/res/cave.ogg b/res/music/cave.ogg similarity index 100% rename from res/cave.ogg rename to res/music/cave.ogg diff --git a/res/cave2.ogg b/res/music/cave2.ogg similarity index 100% rename from res/cave2.ogg rename to res/music/cave2.ogg diff --git a/res/music.ogg b/res/music/music.ogg similarity index 100% rename from res/music.ogg rename to res/music/music.ogg diff --git a/src/res.rs b/src/res.rs index 954e6f5..3d725a5 100644 --- a/src/res.rs +++ b/src/res.rs @@ -11,10 +11,10 @@ pub struct Res { impl Res { pub fn load() -> anyhow::Result { Ok(Self { - tile_atlas: Texture::from_file("res/tiles.png")?, - light_texture: Texture::from_file("res/light2.png")?, - surf_music: Music::from_file("res/music.ogg").unwrap(), - und_music: Music::from_file("res/cave2.ogg").unwrap(), + tile_atlas: Texture::from_file("res/graphics/tiles.png")?, + light_texture: Texture::from_file("res/graphics/light2.png")?, + surf_music: Music::from_file("res/music/music.ogg").unwrap(), + und_music: Music::from_file("res/music/cave2.ogg").unwrap(), }) } }