diff --git a/examples/imgui_integration/assets/arena.map.json b/assets/arena.map.json similarity index 100% rename from examples/imgui_integration/assets/arena.map.json rename to assets/arena.map.json diff --git a/examples/balls/assets/balls.pcx b/assets/balls.pcx similarity index 100% rename from examples/balls/assets/balls.pcx rename to assets/balls.pcx diff --git a/examples/imgui_integration/assets/blue_slime.pcx b/assets/blue_slime.pcx similarity index 100% rename from examples/imgui_integration/assets/blue_slime.pcx rename to assets/blue_slime.pcx diff --git a/examples/imgui_integration/assets/db16.pal b/assets/db16.pal similarity index 100% rename from examples/imgui_integration/assets/db16.pal rename to assets/db16.pal diff --git a/examples/imgui_integration/assets/dp.fnt b/assets/dp.fnt similarity index 100% rename from examples/imgui_integration/assets/dp.fnt rename to assets/dp.fnt diff --git a/examples/audio_playback/assets/explosion.wav b/assets/explosion.wav similarity index 100% rename from examples/audio_playback/assets/explosion.wav rename to assets/explosion.wav diff --git a/examples/slimed/assets/fist.pcx b/assets/fist.pcx similarity index 100% rename from examples/slimed/assets/fist.pcx rename to assets/fist.pcx diff --git a/examples/imgui_integration/assets/green_slime.pcx b/assets/green_slime.pcx similarity index 100% rename from examples/imgui_integration/assets/green_slime.pcx rename to assets/green_slime.pcx diff --git a/examples/slimed/assets/hero_female.pcx b/assets/hero_female.pcx similarity index 100% rename from examples/slimed/assets/hero_female.pcx rename to assets/hero_female.pcx diff --git a/examples/slimed/assets/hero_male.pcx b/assets/hero_male.pcx similarity index 100% rename from examples/slimed/assets/hero_male.pcx rename to assets/hero_male.pcx diff --git a/examples/slimed/assets/items.pcx b/assets/items.pcx similarity index 100% rename from examples/slimed/assets/items.pcx rename to assets/items.pcx diff --git a/examples/audio_playback/assets/jump.wav b/assets/jump.wav similarity index 100% rename from examples/audio_playback/assets/jump.wav rename to assets/jump.wav diff --git a/examples/audio_playback/assets/laser-shoot.wav b/assets/laser-shoot.wav similarity index 100% rename from examples/audio_playback/assets/laser-shoot.wav rename to assets/laser-shoot.wav diff --git a/examples/imgui_integration/assets/orange_slime.pcx b/assets/orange_slime.pcx similarity index 100% rename from examples/imgui_integration/assets/orange_slime.pcx rename to assets/orange_slime.pcx diff --git a/examples/slimed/assets/particles.pcx b/assets/particles.pcx similarity index 100% rename from examples/slimed/assets/particles.pcx rename to assets/particles.pcx diff --git a/examples/audio_playback/assets/pickup-coin.wav b/assets/pickup-coin.wav similarity index 100% rename from examples/audio_playback/assets/pickup-coin.wav rename to assets/pickup-coin.wav diff --git a/examples/audio_playback/assets/powerup.wav b/assets/powerup.wav similarity index 100% rename from examples/audio_playback/assets/powerup.wav rename to assets/powerup.wav diff --git a/examples/imgui_integration/assets/small.fnt b/assets/small.fnt similarity index 100% rename from examples/imgui_integration/assets/small.fnt rename to assets/small.fnt diff --git a/examples/slimed/assets/sword.pcx b/assets/sword.pcx similarity index 100% rename from examples/slimed/assets/sword.pcx rename to assets/sword.pcx diff --git a/examples/imgui_integration/assets/tiles.pcx b/assets/tiles.pcx similarity index 100% rename from examples/imgui_integration/assets/tiles.pcx rename to assets/tiles.pcx diff --git a/examples/slimed/assets/title_screen.map.json b/assets/title_screen.map.json similarity index 100% rename from examples/slimed/assets/title_screen.map.json rename to assets/title_screen.map.json diff --git a/examples/slimed/assets/ui.pcx b/assets/ui.pcx similarity index 100% rename from examples/slimed/assets/ui.pcx rename to assets/ui.pcx diff --git a/examples/audio_playback/src/main.rs b/examples/audio_playback/src/main.rs index 192d7c3..1934786 100644 --- a/examples/audio_playback/src/main.rs +++ b/examples/audio_playback/src/main.rs @@ -58,11 +58,11 @@ fn main() -> Result<()> { let mut volume = 1.0; let sounds = [ - load_and_convert_wav(system.app_root_dir.join("./assets/pickup-coin.wav"), system.res.audio.spec())?, - load_and_convert_wav(system.app_root_dir.join("./assets/powerup.wav"), system.res.audio.spec())?, - load_and_convert_wav(system.app_root_dir.join("./assets/explosion.wav"), system.res.audio.spec())?, - load_and_convert_wav(system.app_root_dir.join("./assets/jump.wav"), system.res.audio.spec())?, - load_and_convert_wav(system.app_root_dir.join("./assets/laser-shoot.wav"), system.res.audio.spec())?, + load_and_convert_wav("./assets/pickup-coin.wav", system.res.audio.spec())?, + load_and_convert_wav("./assets/powerup.wav", system.res.audio.spec())?, + load_and_convert_wav("./assets/explosion.wav", system.res.audio.spec())?, + load_and_convert_wav("./assets/jump.wav", system.res.audio.spec())?, + load_and_convert_wav("./assets/laser-shoot.wav", system.res.audio.spec())?, ]; let mut statuses = [AudioChannelStatus { size: 0, position: 0, playing: false }; NUM_CHANNELS]; diff --git a/examples/balls/src/main.rs b/examples/balls/src/main.rs index d9a5288..fecd087 100644 --- a/examples/balls/src/main.rs +++ b/examples/balls/src/main.rs @@ -24,7 +24,7 @@ fn main() -> Result<()> { let font = BitmaskFont::new_vga_font()?; - let (balls_bmp, balls_palette) = IndexedBitmap::load_pcx_file(system.app_root_dir.join("./assets/balls.pcx"))?; + let (balls_bmp, balls_palette) = IndexedBitmap::load_pcx_file("./assets/balls.pcx")?; system.res.palette = balls_palette.clone(); let mut sprites = Vec::::new(); diff --git a/examples/balls_v2/assets/balls.pcx b/examples/balls_v2/assets/balls.pcx deleted file mode 100644 index e07f633..0000000 Binary files a/examples/balls_v2/assets/balls.pcx and /dev/null differ diff --git a/examples/balls_v2/src/states.rs b/examples/balls_v2/src/states.rs index faf0cd8..0f178dc 100644 --- a/examples/balls_v2/src/states.rs +++ b/examples/balls_v2/src/states.rs @@ -25,7 +25,7 @@ impl Game { pub fn new(mut system: System) -> Result { let font = BitmaskFont::new_vga_font()?; - let (balls_bmp, balls_palette) = IndexedBitmap::load_pcx_file(system.app_root_dir.join("./assets/balls.pcx"))?; + let (balls_bmp, balls_palette) = IndexedBitmap::load_pcx_file("./assets/balls.pcx")?; system.res.palette = balls_palette.clone(); let mut sprites = Vec::new(); diff --git a/examples/imgui_integration/src/context.rs b/examples/imgui_integration/src/context.rs index 3c3f395..30c2255 100644 --- a/examples/imgui_integration/src/context.rs +++ b/examples/imgui_integration/src/context.rs @@ -90,17 +90,17 @@ impl AppContext for GameContext { impl GameContext { pub fn new(system: System) -> Result { - let palette = load_palette(system.app_root_dir.join("./assets/db16.pal"))?; + let palette = load_palette("./assets/db16.pal")?; - let font = load_font(system.app_root_dir.join("./assets/dp.fnt"))?; - let small_font = load_font(system.app_root_dir.join("./assets/small.fnt"))?; + let font = load_font("./assets/dp.fnt")?; + let small_font = load_font("./assets/small.fnt")?; - let tiles = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/tiles.pcx"))?); - let green_slime = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/green_slime.pcx"))?); - let blue_slime = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/blue_slime.pcx"))?); - let orange_slime = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/orange_slime.pcx"))?); + let tiles = Rc::new(load_bitmap_atlas_autogrid("./assets/tiles.pcx")?); + let green_slime = Rc::new(load_bitmap_atlas_autogrid("./assets/green_slime.pcx")?); + let blue_slime = Rc::new(load_bitmap_atlas_autogrid("./assets/blue_slime.pcx")?); + let orange_slime = Rc::new(load_bitmap_atlas_autogrid("./assets/orange_slime.pcx")?); - let tilemap = TileMap::load_from(system.app_root_dir.join("./assets/arena.map.json"))?; + let tilemap = TileMap::load_from("./assets/arena.map.json")?; let entities = Entities::new(); let component_systems = ComponentSystems::new(); diff --git a/examples/slimed/assets/arena.map.json b/examples/slimed/assets/arena.map.json deleted file mode 100644 index d1e4a6f..0000000 --- a/examples/slimed/assets/arena.map.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "width":40, - "height":30, - "layers":[ - [96,96,96,96,96,96,96,96,96,96,96,96,16,17,16,16,16,16,16,17,17,32,16,16,16,16,16,32,16,16,16,16,16,16,16,16,16,33,16,16,96,96,96,96,96,96,96,96,96,96,96,16,17,17,17,32,17,32,16,16,32,16,16,32,16,16,16,16,16,16,32,16,33,16,16,16,16,16,16,16,96,96,96,96,96,96,96,96,96,96,181,178,178,178,178,183,32,16,17,181,178,178,178,178,178,178,178,178,178,178,178,183,16,16,16,16,16,16,16,32,96,96,96,96,96,96,96,96,96,181,195,16,32,17,17,193,178,178,178,195,16,16,16,16,16,16,32,16,16,16,16,193,178,183,16,32,16,16,16,16,96,96,96,96,96,96,96,181,178,195,16,16,16,32,17,17,17,17,32,16,16,16,33,16,16,16,16,16,16,16,16,16,16,193,183,16,16,16,33,16,96,96,96,96,96,96,181,195,32,16,16,16,16,16,16,16,32,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,32,16,193,183,16,16,16,16,16,17,16,16,96,181,195,16,16,33,16,16,16,16,16,32,16,16,16,16,16,32,16,16,16,16,48,48,48,48,16,16,16,16,16,196,16,16,16,16,32,16,17,16,181,195,16,16,16,16,16,32,16,16,16,16,16,16,16,16,16,16,16,16,48,48,48,48,48,48,48,48,16,16,32,193,183,16,32,16,8,8,8,181,195,16,16,16,16,17,32,16,16,16,16,16,16,16,16,16,16,16,16,48,48,48,48,48,48,48,48,48,48,16,16,16,196,16,16,16,7,7,7,196,16,32,16,32,17,17,17,16,16,16,16,33,16,16,16,16,16,16,48,48,48,48,48,48,48,48,48,48,48,48,16,16,193,183,16,32,7,7,181,195,16,16,16,16,16,32,16,16,16,16,16,16,16,16,16,32,16,16,16,48,48,48,48,48,48,48,48,48,48,48,48,32,16,196,32,16,7,7,196,16,16,32,16,16,32,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,48,48,48,48,48,48,48,48,48,48,16,16,16,196,16,16,7,7,196,8,8,16,16,16,16,16,16,32,16,16,16,16,32,16,16,16,16,16,16,16,16,48,48,48,48,48,48,48,48,16,16,16,16,196,17,16,7,7,196,7,7,16,16,16,16,16,16,16,16,16,33,16,16,16,16,16,16,16,16,16,32,16,16,48,48,48,48,48,16,16,16,16,16,196,17,16,7,7,196,7,7,16,16,16,16,16,33,16,16,16,16,16,16,16,16,16,32,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,196,17,16,16,16,196,16,33,16,16,16,16,16,16,16,16,16,16,16,32,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,196,32,16,16,16,196,16,16,16,16,16,32,16,16,16,16,32,16,16,16,32,16,16,16,16,16,16,16,16,32,16,16,16,16,16,16,16,16,16,16,196,16,16,16,16,196,32,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,32,16,16,16,16,16,16,16,33,16,16,16,16,16,32,16,196,16,33,32,16,196,16,16,16,16,32,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,33,16,16,16,16,16,16,16,16,16,16,16,16,16,196,32,16,16,16,196,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,32,16,16,16,16,16,196,16,16,16,16,193,183,16,16,48,48,48,48,48,16,16,16,16,16,32,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,196,32,16,32,16,33,196,48,48,48,48,48,48,48,48,16,16,16,16,16,16,16,16,32,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,196,16,16,16,16,16,193,183,48,48,48,48,48,48,48,48,16,16,32,16,16,16,16,16,16,16,16,33,16,16,16,16,16,16,16,16,16,16,16,16,196,16,16,16,32,16,16,196,48,48,48,48,48,48,48,48,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,32,16,196,16,16,16,16,16,16,193,183,48,48,48,48,48,48,48,48,48,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,181,195,16,16,16,16,16,16,16,193,183,48,48,48,48,48,48,48,48,48,48,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,196,16,16,16,16,16,16,16,16,16,193,178,178,183,48,48,48,48,48,48,48,48,16,16,16,16,16,32,16,16,16,16,32,16,16,16,16,16,16,181,195,16,16,16,32,16,16,33,16,32,16,16,16,193,178,178,178,178,178,178,178,178,183,16,32,16,16,16,16,16,33,16,16,16,16,16,16,181,178,195,32,16,16,16,16,16,16,16,16,16,16,32,16,16,16,16,16,16,16,33,32,17,193,178,178,178,178,178,178,178,178,178,178,178,178,178,178,195,16,16,16,16,16,48,16,16,32,16,16,16,16,16,16,16,16,16,16,32,16,16,16,16,32,16,16,32,16,16,16,32,16,16,16,33,16,16,32,16,16,16,16,16,48,48], - [-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,87,-1,104,108,108,108,105,-1,-1,-1,-1,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,98,105,-1,-1,-1,26,-1,26,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,27,-1,-1,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,266,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,80,-1,266,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,26,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,26,-1,-1,80,108,108,108,97,-1,-1,-1,-1,266,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,49,51,-1,-1,-1,-1,52,50,-1,-1,-1,-1,-1,-1,-1,-1,46,46,46,102,-1,-1,27,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,49,51,-1,-1,-1,-1,-1,-1,27,-1,52,50,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,51,-1,-1,26,-1,-1,-1,-1,-1,-1,27,52,50,-1,-1,-1,-1,-1,-1,-1,-1,-1,266,-1,-1,-1,-1,-1,-1,-1,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,278,-1,-1,-1,-1,52,-1,-1,-1,26,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,26,-1,-1,-1,-1,67,-1,-1,27,279,-1,-1,294,-1,-1,-1,-1,-1,-1,-1,-1,-1,83,-1,-1,-1,46,46,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,65,67,-1,-1,-1,-1,-1,-1,26,-1,-1,266,68,-1,-1,-1,-1,86,-1,-1,-1,-1,-1,29,-1,-1,-1,-1,-1,-1,26,-1,-1,-1,-1,-1,-1,-1,-1,27,-1,65,67,-1,-1,-1,-1,-1,-1,-1,-1,68,66,-1,-1,-1,-1,86,-1,-1,-1,-1,-1,29,-1,27,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,65,67,-1,-1,-1,-1,-1,68,66,-1,-1,26,-1,-1,86,-1,-1,-1,-1,-1,29,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,86,14,14,-1,14,14,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,86,-1,282,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,80,-1,-1,-1,-1,104,-1,282,-1,-1,-1,259,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,26,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,26,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,80,-1,281,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,49,51,-1,-1,-1,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,80,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,-1,-1,-1,-1,-1,-1,-1,-1,-1,278,-1,-1,278,-1,-1,266,27,-1,278,-1,-1,-1,-1,26,-1,-1,-1,-1,-1,-1,-1,-1,26,-1,-1,-1,-1,-1,27,-1,50,-1,-1,-1,-1,-1,-1,-1,-1,294,-1,-1,294,-1,27,279,-1,-1,294,-1,-1,26,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,52,50,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,278,-1,-1,-1,-1,266,-1,-1,-1,-1,-1,-1,-1,-1,52,50,-1,-1,-1,-1,-1,-1,-1,-1,278,-1,-1,278,-1,-1,278,-1,-1,80,-1,-1,-1,-1,26,-1,294,-1,-1,-1,-1,-1,27,-1,-1,-1,-1,-1,-1,-1,-1,266,52,-1,-1,-1,27,279,-1,-1,294,-1,-1,294,-1,-1,294,-1,266,-1,-1,-1,26,-1,-1,-1,-1,-1,260,-1,-1,-1,-1,-1,-1,27,-1,-1,-1,26,-1,-1,-1,50,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,27,-1,-1,27,-1,49,-1,278,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,266,-1,-1,-1,-1,-1,-1,-1,27,-1,-1,-1,-1,-1,49,51,-1,294,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,27,-1,49,51,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,49,51,27,-1], - [-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,1,1,1,1,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,-1,-1,-1,-1,-1,-1,-1,-1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,-1,-1,-1,-1,-1,-1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,-1,-1,-1,-1,-1,-1,0,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,0,0,-1,-1,-1,-1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,-1,0,1,1,0,1,1,1,1,1,1,1,0,-1,-1,-1,-1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,-1,-1,-1,-1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,-1,-1,-1,-1,0,0,0,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,-1,-1,-1,-1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,-1,-1,-1,-1,0,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,-1,-1,-1,-1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,-1,-1,-1,-1,0,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,-1,-1,-1,-1,0,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,-1,-1,-1,-1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,-1,-1,-1,-1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,-1,-1,-1,-1,-1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,1,1,1,1,1,0,1,1,1,1,1,0,-1,-1,-1,-1,-1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,1,1,0,1,1,0,1,1,1,1,1,0,-1,-1,-1,-1,-1,-1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,-1,-1,-1,-1,-1,-1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,1,1,0,1,1,0,1,0,0,-1,-1,-1,-1,-1,-1,-1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,1,1,0,1,1,0,1,1,1,1,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1] - ] -} \ No newline at end of file diff --git a/examples/slimed/assets/blue_slime.pcx b/examples/slimed/assets/blue_slime.pcx deleted file mode 100644 index 7582cab..0000000 Binary files a/examples/slimed/assets/blue_slime.pcx and /dev/null differ diff --git a/examples/slimed/assets/db16.pal b/examples/slimed/assets/db16.pal deleted file mode 100644 index 869edaa..0000000 Binary files a/examples/slimed/assets/db16.pal and /dev/null differ diff --git a/examples/slimed/assets/dp.fnt b/examples/slimed/assets/dp.fnt deleted file mode 100644 index 038ecc6..0000000 Binary files a/examples/slimed/assets/dp.fnt and /dev/null differ diff --git a/examples/slimed/assets/green_slime.pcx b/examples/slimed/assets/green_slime.pcx deleted file mode 100644 index a663d3b..0000000 Binary files a/examples/slimed/assets/green_slime.pcx and /dev/null differ diff --git a/examples/slimed/assets/orange_slime.pcx b/examples/slimed/assets/orange_slime.pcx deleted file mode 100644 index d7583a3..0000000 Binary files a/examples/slimed/assets/orange_slime.pcx and /dev/null differ diff --git a/examples/slimed/assets/tiles.pcx b/examples/slimed/assets/tiles.pcx deleted file mode 100644 index 1801a11..0000000 Binary files a/examples/slimed/assets/tiles.pcx and /dev/null differ diff --git a/examples/slimed/src/main.rs b/examples/slimed/src/main.rs index 7b7883c..f6c8a7b 100644 --- a/examples/slimed/src/main.rs +++ b/examples/slimed/src/main.rs @@ -107,30 +107,30 @@ impl AppContext for Game { impl Game { pub fn new(mut system: System) -> Result { - let palette = load_palette(system.app_root_dir.join("./assets/db16.pal"))?; + let palette = load_palette("./assets/db16.pal")?; system.res.palette = palette.clone(); - let font = load_font(system.app_root_dir.join("./assets/dp.fnt"))?; + let font = load_font("./assets/dp.fnt")?; - let tiles = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/tiles.pcx"))?); - let hero_male = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/hero_male.pcx"))?); - let hero_female = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/hero_female.pcx"))?); - let green_slime = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/green_slime.pcx"))?); - let blue_slime = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/blue_slime.pcx"))?); - let orange_slime = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/orange_slime.pcx"))?); - let fist = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/fist.pcx"))?); - let sword = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/sword.pcx"))?); - let particles = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/particles.pcx"))?); - let items = Rc::new(load_bitmap_atlas_autogrid(system.app_root_dir.join("./assets/items.pcx"))?); + let tiles = Rc::new(load_bitmap_atlas_autogrid("./assets/tiles.pcx")?); + let hero_male = Rc::new(load_bitmap_atlas_autogrid("./assets/hero_male.pcx")?); + let hero_female = Rc::new(load_bitmap_atlas_autogrid("./assets/hero_female.pcx")?); + let green_slime = Rc::new(load_bitmap_atlas_autogrid("./assets/green_slime.pcx")?); + let blue_slime = Rc::new(load_bitmap_atlas_autogrid("./assets/blue_slime.pcx")?); + let orange_slime = Rc::new(load_bitmap_atlas_autogrid("./assets/orange_slime.pcx")?); + let fist = Rc::new(load_bitmap_atlas_autogrid("./assets/fist.pcx")?); + let sword = Rc::new(load_bitmap_atlas_autogrid("./assets/sword.pcx")?); + let particles = Rc::new(load_bitmap_atlas_autogrid("./assets/particles.pcx")?); + let items = Rc::new(load_bitmap_atlas_autogrid("./assets/items.pcx")?); - let mut ui = load_bitmap_atlas(system.app_root_dir.join("./assets/ui.pcx"))?; + let mut ui = load_bitmap_atlas("./assets/ui.pcx")?; ui.add(Rect::new(0, 0, 16, 16))?; ui.add(Rect::new(16, 0, 16, 16))?; for i in 0..8 { ui.add(Rect::new(i * 8, 16, 8, 8))?; } - let tilemap = TileMap::load_from(system.app_root_dir.join("./assets/title_screen.map.json"))?; + let tilemap = TileMap::load_from("./assets/title_screen.map.json")?; let entities = Entities::new(); let component_systems = ComponentSystems::new(); diff --git a/examples/slimed/src/states.rs b/examples/slimed/src/states.rs index b55e060..41dab3d 100644 --- a/examples/slimed/src/states.rs +++ b/examples/slimed/src/states.rs @@ -86,13 +86,7 @@ impl AppState for MainMenuState { fn state_change(&mut self, new_state: State, old_state: State, context: &mut Game) { match new_state { State::Pending | State::Resume => { - init_everything( - context, - context.core.system.app_root_dir.join("./assets/title_screen.map.json"), - 0.2, - 1.0, - 32, - ); + init_everything(context, "./assets/title_screen.map.json", 0.2, 1.0, 32); } State::TransitionIn => { self.fade = 0.0; @@ -223,13 +217,7 @@ impl AppState for GamePlayState { fn state_change(&mut self, new_state: State, old_state: State, context: &mut Game) { match new_state { State::Pending => { - init_everything( - context, - context.core.system.app_root_dir.join("./assets/arena.map.json"), - 0.5, - 2.0, - 100, - ); + init_everything(context, "./assets/arena.map.json", 0.5, 2.0, 100); spawn_player_randomly(&mut context.core); } State::TransitionIn => {