Upgrade to bevy 0.7

Cargo.toml

@@ -11,8 +11,8 @@ bevy = "0.7"
 # asefile = "0.3.2"
 asefile = { git = "https://github.com/B-Reif/asefile", branch = "fix-tileset-inner" }
 anyhow = "1.0"
-benimator = { version = "2.0", optional = true }
-bevy_ecs_tilemap = { version = "0.5", optional = true }
+benimator = { version = "3.0", optional = true }
+bevy_ecs_tilemap = { version = "0.6", optional = true }
 
 [profile.dev.package."*"]
 opt-level = 2
@@ -23,4 +23,4 @@ required-features = ["benimator"]
 
 [[example]]
 name = "tilemap"
-required-features = ["bevy_ecs_tilemap"]
+required-features = ["bevy_ecs_tilemap"]

examples/animated/main.rs

@@ -12,13 +12,13 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(loader::AseLoaderDefaultPlugin)
         .add_plugin(benimator::AnimationPlugin::default())
-        .add_system(exit_on_esc_system.system())
+        .add_system(exit_on_esc_system)
         .add_state(AppState::Loading)
-        .add_system_set(SystemSet::on_enter(AppState::Loading).with_system(load_sprites.system()))
+        .add_system_set(SystemSet::on_enter(AppState::Loading).with_system(load_sprites))
         .add_system_set(
-            SystemSet::on_update(AppState::Loading).with_system(check_loading_sprites.system()),
+            SystemSet::on_update(AppState::Loading).with_system(check_loading_sprites),
         )
-        .add_system_set(SystemSet::on_enter(AppState::Game).with_system(spawn_sprites.system()))
+        .add_system_set(SystemSet::on_enter(AppState::Game).with_system(spawn_sprites))
         .run()
 }
 

examples/tilemap/main.rs

@@ -14,14 +14,14 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .add_plugin(TilemapPlugin)
         .add_plugin(loader::AseLoaderDefaultPlugin)
-        .add_system(exit_on_esc_system.system())
+        .add_system(exit_on_esc_system)
         .add_state(AppState::Loading)
-        .add_system_set(SystemSet::on_enter(AppState::Loading).with_system(load_sprites.system()))
+        .add_system_set(SystemSet::on_enter(AppState::Loading).with_system(load_sprites))
         .add_system_set(
-            SystemSet::on_update(AppState::Loading).with_system(check_loading_sprites.system()),
+            SystemSet::on_update(AppState::Loading).with_system(check_loading_sprites),
         )
-        .add_system_set(SystemSet::on_enter(AppState::Game).with_system(spawn_camera.system()))
-        .add_system_set(SystemSet::on_enter(AppState::Game).with_system(spawn_tiles.system()))
+        .add_system_set(SystemSet::on_enter(AppState::Game).with_system(spawn_camera))
+        .add_system_set(SystemSet::on_enter(AppState::Game).with_system(spawn_tiles))
         .run()
 }
 
@@ -64,7 +64,7 @@ fn set_tiles(layer_builder: &mut LayerBuilder<TileBundle>) {
                 ..Tile::default()
             };
             let tile_pos = UVec2::new(x as u32, y as u32);
-            layer_builder.set_tile(tile_pos, tile.into()).unwrap();
+            layer_builder.set_tile(tile_pos.into(), tile.into()).unwrap();
         }
     }
 }
@@ -77,16 +77,16 @@ fn spawn_tiles(
 ) {
     for (_, tileset) in tilesets.iter() {
         let texture_handle = tileset.texture.clone();
-        let material_handle = materials.add(ColorMaterial::texture(texture_handle));
+        //let material_handle = materials.add(ColorMaterial::from(texture_handle));
         // The layer_settings method of Tileset is implemented in the "bevy_ecs_tilemap" feature.
-        let settings = tileset.layer_settings(UVec2::new(3, 3), UVec2::new(3, 3));
+        let settings = tileset.layer_settings(MapSize(3, 3), ChunkSize(3, 3));
 
         let (mut layer_builder, layer_entity) =
             LayerBuilder::<TileBundle>::new(&mut commands, settings, 0u16, 0u16);
 
         set_tiles(&mut layer_builder);
 
-        map_query.build_layer(&mut commands, layer_builder, material_handle);
+        map_query.build_layer(&mut commands, layer_builder, texture_handle);
 
         let map_entity = commands.spawn().id();
         let mut map = Map::new(0u16, map_entity);

src/asset/animation.rs

@@ -44,7 +44,7 @@ pub(crate) struct SpriteData<T> {
 }
 impl SpriteData<Image> {
     pub(crate) fn new(ase: &AsepriteFile, frame: u32) -> Self {
-        let img = ase.frame(frame).image();
+        let img = &ase.frame(frame).image();
         let size = Extent3d {
             width: ase.width() as u32,
             height: ase.height() as u32,

src/bevy_ecs_tilemap.rs

@@ -1,5 +1,5 @@
 use crate::asset::{TileSize, Tileset};
-use bevy::math::{UVec2, Vec2};
+use bevy::prelude::Vec2;
 use bevy_ecs_tilemap::prelude::*;
 
 impl From<TileSize> for Vec2 {
@@ -16,22 +16,22 @@ impl Tileset {
     /// ```
     /// #[cfg(feature = "bevy_ecs_tilemap")]
     /// use bevy_ase::asset::Tileset;
-    /// use bevy_ecs_tilemap::LayerSettings;
-    /// use bevy::math::UVec2;
+    /// use bevy_ecs_tilemap::{MapSize, ChunkSize, LayerSettings};
     ///
     /// // Create new layer settings from a tileset, with specified map size and chunk size.
     /// fn my_layer_settings(tileset: &Tileset) -> LayerSettings {
-    ///     let map_size = UVec2::new(30, 30);
-    ///     let chunk_size = UVec2::new(15, 15);
+    ///     let map_size = MapSize(30, 30);
+    ///     let chunk_size = ChunkSize(15, 15);
     ///     tileset.layer_settings(map_size, chunk_size)       
     /// }
     /// ```
-    pub fn layer_settings(&self, map_size: UVec2, chunk_size: UVec2) -> LayerSettings {
+    pub fn layer_settings(&self, map_size: MapSize, chunk_size: ChunkSize) -> LayerSettings {
+        let texture_size = self.texture_size();
         LayerSettings::new(
             map_size,
             chunk_size,
-            Vec2::new(self.tile_size.width as f32, self.tile_size.height as f32),
-            self.texture_size(),
+            TileSize(self.tile_size.width as f32, self.tile_size.height as f32),
+            TextureSize(texture_size.x, texture_size.y),
         )
     }
 }

src/loader.rs

@@ -285,7 +285,7 @@ pub(crate) type AseAssetResources<'a> = (
 /// // Creates a Bevy app and adds the ase_importer system.
 /// // This system is already added by default in AseLoaderPlugin.
 /// fn app() {
-///     App::new().add_system(ase_importer.system());
+///     App::new().add_system(ase_importer);
 /// }
 /// ```
 pub fn ase_importer(