Helpers overhaul

Cargo.toml

@@ -30,12 +30,12 @@ tiled = { version = "0.9", default-features = false }
 [dev-dependencies.bevy]
 version = "0.8"
 default-features = false
-features=["bevy_core_pipeline", "bevy_render", "bevy_asset", "png", "bevy_winit", "filesystem_watcher"]
+features=["bevy_core_pipeline", "bevy_render", "bevy_asset", "png", "bevy_winit", "bevy_text", "bevy_sprite", "filesystem_watcher"]
 
 [target.'cfg(unix)'.dev-dependencies.bevy]
 version = "0.8"
 default-features = false
-features=["bevy_core_pipeline", "bevy_render", "bevy_asset", "png", "bevy_winit", "x11"]
+features=["bevy_core_pipeline", "bevy_render", "bevy_asset", "png", "bevy_winit", "x11", "bevy_text", "bevy_sprite"]
 
 [target.wasm32-unknown-unknown]
 runner = "wasm-server-runner"

examples/accessing_tiles.rs

@@ -26,7 +26,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
     // For the purposes of this example, we consider a square tile map,
     // where diagonals are also considered to be neighbors.
     let tilemap_type = TilemapType::Square {
-        neighbors_include_diagonals: true,
+        diagonal_neighbors: true,
     };
 
     // Create a tilemap entity a little early
@@ -89,7 +89,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             map_type: tilemap_type,
             texture: TilemapTexture(texture_handle),
             tile_size,
-            transform: get_centered_transform_2d(&tilemap_size, &tile_size, 0.0),
+            transform: get_tilemap_center_transform(&tilemap_size, &tile_size, 0.0),
             ..Default::default()
         })
         .insert(LastUpdate(0.0))

examples/animation.rs

@@ -68,7 +68,7 @@ fn create_background(mut commands: Commands, asset_server: Res<AssetServer>) {
             tile_size,
             storage: tilemap_storage,
             texture: TilemapTexture(texture_handle.clone()),
-            transform: get_centered_transform_2d(&size, &tile_size, 0.0),
+            transform: get_tilemap_center_transform(&size, &tile_size, 0.0),
             ..Default::default()
         });
 }
@@ -123,7 +123,7 @@ fn create_animated_flowers(mut commands: Commands, asset_server: Res<AssetServer
             storage: tilemap_storage,
             texture: TilemapTexture(texture_handle.clone()),
             tile_size,
-            transform: get_centered_transform_2d(&size, &tile_size, 1.0),
+            transform: get_tilemap_center_transform(&size, &tile_size, 1.0),
             ..Default::default()
         });
 }

examples/basic.rs

@@ -1,5 +1,6 @@
 use bevy::{prelude::*, render::texture::ImageSettings};
 use bevy_ecs_tilemap::prelude::*;
+
 mod helpers;
 
 fn startup(
@@ -54,7 +55,7 @@ fn startup(
             storage: tile_storage,
             texture: TilemapTexture(texture_handle),
             tile_size,
-            transform: get_centered_transform_2d(&tilemap_size, &tile_size, 0.0),
+            transform: get_tilemap_center_transform(&tilemap_size, &tile_size, 0.0),
             ..Default::default()
         });
 
@@ -79,7 +80,7 @@ fn swap_texture_or_hide(
         let texture_handle_a: Handle<Image> = asset_server.load("tiles.png");
         let texture_handle_b: Handle<Image> = asset_server.load("tiles2.png");
         for (mut tilemap_tex, _) in &mut query {
-            if &tilemap_tex.0 == &texture_handle_a {
+            if tilemap_tex.0 == texture_handle_a {
                 tilemap_tex.0 = texture_handle_b.clone();
             } else {
                 tilemap_tex.0 = texture_handle_a.clone();

examples/bench.rs

@@ -34,7 +34,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             storage: tile_storage,
             texture: TilemapTexture(texture_handle),
             tile_size,
-            transform: get_centered_transform_2d(&tilemap_size, &tile_size, 0.0),
+            transform: get_tilemap_center_transform(&tilemap_size, &tile_size, 0.0),
             ..Default::default()
         });
 }

examples/colors.rs

@@ -85,7 +85,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             texture: TilemapTexture(texture_handle),
             tile_size,
             map_type: TilemapType::Square {
-                neighbors_include_diagonals: false,
+                diagonal_neighbors: false,
             },
             ..Default::default()
         });

examples/game_of_life.rs

@@ -40,9 +40,9 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             storage: tile_storage,
             texture: TilemapTexture(texture_handle),
             tile_size,
-            transform: get_centered_transform_2d(&tilemap_size, &tile_size, 0.0),
+            transform: get_tilemap_center_transform(&tilemap_size, &tile_size, 0.0),
             map_type: TilemapType::Square {
-                neighbors_include_diagonals: true,
+                diagonal_neighbors: true,
             },
             ..Default::default()
         })

examples/helpers/tiled.rs

@@ -131,10 +131,8 @@ pub fn process_loaded_maps(
                 // TODO: Create a RemoveMap component..
                 for layer_entity in layer_storage.storage.values() {
                     if let Ok((_, layer_tile_storage)) = tile_storage_query.get(*layer_entity) {
-                        for tile in layer_tile_storage.iter() {
-                            if let Some(tile) = tile {
-                                commands.entity(*tile).despawn_recursive()
-                            }
+                        for tile in layer_tile_storage.iter().flatten() {
+                            commands.entity(*tile).despawn_recursive()
                         }
                     }
                     // commands.entity(*layer_entity).despawn_recursive();
@@ -170,15 +168,15 @@ pub fn process_loaded_maps(
                                 TilemapType::Hexagon(HexCoordSystem::Row)
                             }
                             tiled::Orientation::Isometric => TilemapType::Isometric {
-                                neighbors_include_diagonals: false,
+                                diagonal_neighbors: false,
                                 coord_system: IsoCoordSystem::Diamond,
                             },
                             tiled::Orientation::Staggered => TilemapType::Isometric {
-                                neighbors_include_diagonals: false,
+                                diagonal_neighbors: false,
                                 coord_system: IsoCoordSystem::Staggered,
                             },
                             tiled::Orientation::Orthogonal => TilemapType::Square {
-                                neighbors_include_diagonals: false,
+                                diagonal_neighbors: false,
                             },
                         };
 
@@ -241,7 +239,7 @@ pub fn process_loaded_maps(
                             ),
                             tile_size,
                             spacing: tile_spacing,
-                            transform: bevy_ecs_tilemap::helpers::get_centered_transform_2d(
+                            transform: get_tilemap_center_transform(
                                 &map_size,
                                 &tile_size,
                                 layer.layer_index as f32,

examples/layers.rs

@@ -31,7 +31,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             storage: tile_storage,
             texture: TilemapTexture(texture_handle.clone()),
             tile_size,
-            transform: get_centered_transform_2d(&tilemap_size, &tile_size, 0.0),
+            transform: get_tilemap_center_transform(&tilemap_size, &tile_size, 0.0),
             ..Default::default()
         });
 
@@ -55,7 +55,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             storage: tile_storage,
             texture: TilemapTexture(texture_handle),
             tile_size: TilemapTileSize { x: 16.0, y: 16.0 },
-            transform: get_centered_transform_2d(&tilemap_size, &tile_size, 1.0)
+            transform: get_tilemap_center_transform(&tilemap_size, &tile_size, 1.0)
                 * Transform::from_xyz(32.0, 32.0, 0.0),
             ..Default::default()
         });

examples/ldtk/ldtk.rs

@@ -1,4 +1,5 @@
 use bevy_ecs_tilemap::{
+    helpers::geometry::get_tilemap_center_transform,
     map::{TilemapGridSize, TilemapId, TilemapSize, TilemapTexture, TilemapTileSize},
     tiles::{TileBundle, TilePos, TileStorage, TileTexture},
     TilemapBundle,
@@ -208,7 +209,7 @@ pub fn process_loaded_tile_maps(
                             storage,
                             texture: TilemapTexture(texture),
                             tile_size,
-                            transform: bevy_ecs_tilemap::helpers::get_centered_transform_2d(
+                            transform: get_tilemap_center_transform(
                                 &size,
                                 &tile_size,
                                 layer_id as f32,