From 37de703b2877c69ac19bd86910e4437b2f25ee33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Thulliez?= <43185161+grzi@users.noreply.github.com> Date: Fri, 4 Jun 2021 00:02:43 +0200 Subject: [PATCH] chore: Move assets to examples (#113) FIXES #84 --- README.md | 2 +- assets/banner.png => banner.png | Bin {assets/mario => examples/mario/assets}/level.csv | 0 {assets/mario => examples/mario/assets}/level.png | Bin .../mario => examples/mario/assets}/spritesheet.png | Bin examples/mario/main.rs | 4 ++-- {assets => examples/taquin/assets}/taquin.png | Bin examples/taquin/main.rs | 2 +- {assets/tetris => examples/tetris/assets}/black.png | Bin {assets/tetris => examples/tetris/assets}/blocs.png | Bin {assets/tetris => examples/tetris/assets}/blue.png | Bin {assets/tetris => examples/tetris/assets}/brown.png | Bin {assets/tetris => examples/tetris/assets}/cyan.png | Bin {assets/tetris => examples/tetris/assets}/font.png | Bin {assets/tetris => examples/tetris/assets}/green.png | Bin {assets/tetris => examples/tetris/assets}/pink.png | Bin {assets/tetris => examples/tetris/assets}/red.png | Bin {assets/tetris => examples/tetris/assets}/ui.png | Bin .../tetris/assets}/ui_overflow_top.png | Bin .../tetris => examples/tetris/assets}/yellow.png | Bin examples/tetris/main.rs | 2 +- 21 files changed, 5 insertions(+), 5 deletions(-) rename assets/banner.png => banner.png (100%) rename {assets/mario => examples/mario/assets}/level.csv (100%) rename {assets/mario => examples/mario/assets}/level.png (100%) rename {assets/mario => examples/mario/assets}/spritesheet.png (100%) rename {assets => examples/taquin/assets}/taquin.png (100%) rename {assets/tetris => examples/tetris/assets}/black.png (100%) rename {assets/tetris => examples/tetris/assets}/blocs.png (100%) rename {assets/tetris => examples/tetris/assets}/blue.png (100%) rename {assets/tetris => examples/tetris/assets}/brown.png (100%) rename {assets/tetris => examples/tetris/assets}/cyan.png (100%) rename {assets/tetris => examples/tetris/assets}/font.png (100%) rename {assets/tetris => examples/tetris/assets}/green.png (100%) rename {assets/tetris => examples/tetris/assets}/pink.png (100%) rename {assets/tetris => examples/tetris/assets}/red.png (100%) rename {assets/tetris => examples/tetris/assets}/ui.png (100%) rename {assets/tetris => examples/tetris/assets}/ui_overflow_top.png (100%) rename {assets/tetris => examples/tetris/assets}/yellow.png (100%) diff --git a/README.md b/README.md index 32b8aad..e907ed2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Scion +Scion Scion is a 2D game library made in rust. diff --git a/assets/banner.png b/banner.png similarity index 100% rename from assets/banner.png rename to banner.png diff --git a/assets/mario/level.csv b/examples/mario/assets/level.csv similarity index 100% rename from assets/mario/level.csv rename to examples/mario/assets/level.csv diff --git a/assets/mario/level.png b/examples/mario/assets/level.png similarity index 100% rename from assets/mario/level.png rename to examples/mario/assets/level.png diff --git a/assets/mario/spritesheet.png b/examples/mario/assets/spritesheet.png similarity index 100% rename from assets/mario/spritesheet.png rename to examples/mario/assets/spritesheet.png diff --git a/examples/mario/main.rs b/examples/mario/main.rs index 8f922d1..12f4aa1 100644 --- a/examples/mario/main.rs +++ b/examples/mario/main.rs @@ -99,7 +99,7 @@ impl SimpleGameLayer for Mario { fn add_level_data(world: &mut World) -> Vec> { let file = read_file(Path::new( - &app_base_path().join("assets/mario/level.csv").get(), + &app_base_path().join("examples/mario/assets/level.csv").get(), )) .unwrap_or(vec![]); let csv = from_utf8(file.as_slice()).expect("no"); @@ -151,7 +151,7 @@ fn add_level_data(world: &mut World) -> Vec> { fn add_background(world: &mut World) { let background = ( Rectangle::new(2560., 640., None), - Material::Texture(app_base_path().join("assets/mario/level.png").get()), + Material::Texture(app_base_path().join("examples/mario/assets/level.png").get()), Transform::new(Coordinates::new_with_layer(0., 0., 1), 1., 0.), ); world.push(background); diff --git a/assets/taquin.png b/examples/taquin/assets/taquin.png similarity index 100% rename from assets/taquin.png rename to examples/taquin/assets/taquin.png diff --git a/examples/taquin/main.rs b/examples/taquin/main.rs index c086378..363c7c4 100644 --- a/examples/taquin/main.rs +++ b/examples/taquin/main.rs @@ -122,7 +122,7 @@ struct Layer; impl SimpleGameLayer for Layer { fn on_start(&mut self, world: &mut World, resource: &mut Resources) { - let p = app_base_path().join("assets/taquin.png").get(); + let p = app_base_path().join("examples/taquin/assets/taquin.png").get(); for x in 0..4 { for y in 0..4 { if !(x == 3 && y == 3) { diff --git a/assets/tetris/black.png b/examples/tetris/assets/black.png similarity index 100% rename from assets/tetris/black.png rename to examples/tetris/assets/black.png diff --git a/assets/tetris/blocs.png b/examples/tetris/assets/blocs.png similarity index 100% rename from assets/tetris/blocs.png rename to examples/tetris/assets/blocs.png diff --git a/assets/tetris/blue.png b/examples/tetris/assets/blue.png similarity index 100% rename from assets/tetris/blue.png rename to examples/tetris/assets/blue.png diff --git a/assets/tetris/brown.png b/examples/tetris/assets/brown.png similarity index 100% rename from assets/tetris/brown.png rename to examples/tetris/assets/brown.png diff --git a/assets/tetris/cyan.png b/examples/tetris/assets/cyan.png similarity index 100% rename from assets/tetris/cyan.png rename to examples/tetris/assets/cyan.png diff --git a/assets/tetris/font.png b/examples/tetris/assets/font.png similarity index 100% rename from assets/tetris/font.png rename to examples/tetris/assets/font.png diff --git a/assets/tetris/green.png b/examples/tetris/assets/green.png similarity index 100% rename from assets/tetris/green.png rename to examples/tetris/assets/green.png diff --git a/assets/tetris/pink.png b/examples/tetris/assets/pink.png similarity index 100% rename from assets/tetris/pink.png rename to examples/tetris/assets/pink.png diff --git a/assets/tetris/red.png b/examples/tetris/assets/red.png similarity index 100% rename from assets/tetris/red.png rename to examples/tetris/assets/red.png diff --git a/assets/tetris/ui.png b/examples/tetris/assets/ui.png similarity index 100% rename from assets/tetris/ui.png rename to examples/tetris/assets/ui.png diff --git a/assets/tetris/ui_overflow_top.png b/examples/tetris/assets/ui_overflow_top.png similarity index 100% rename from assets/tetris/ui_overflow_top.png rename to examples/tetris/assets/ui_overflow_top.png diff --git a/assets/tetris/yellow.png b/examples/tetris/assets/yellow.png similarity index 100% rename from assets/tetris/yellow.png rename to examples/tetris/assets/yellow.png diff --git a/examples/tetris/main.rs b/examples/tetris/main.rs index 8bc63b4..97d6536 100644 --- a/examples/tetris/main.rs +++ b/examples/tetris/main.rs @@ -44,5 +44,5 @@ fn app_config() -> ScionConfig { } pub fn asset_path() -> PathBuilder { - app_base_path().join("assets/tetris") + app_base_path().join("examples/tetris/assets/") }