Preparing changing TilemapTexture to an enum; making sure atlas mode …

…still works.
StarArawn · Sep 30, 2022 · 0e71c8a · 0e71c8a
1 parent bf73a81
commit 0e71c8a
Show file tree

Hide file tree

Showing 29 changed files with 168 additions and 98 deletions.
diff --git a/examples/accessing_tiles.rs b/examples/accessing_tiles.rs
@@ -88,7 +88,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             size: tilemap_size,
             storage: tile_storage,
             map_type: tilemap_type,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
             ..Default::default()

diff --git a/examples/animation.rs b/examples/animation.rs
@@ -59,7 +59,7 @@ fn create_background(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             tile_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             transform: get_tilemap_center_transform(&size, &grid_size, 0.0),
             ..Default::default()
         });
@@ -114,7 +114,7 @@ fn create_animated_flowers(mut commands: Commands, asset_server: Res<AssetServer
             grid_size,
             size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             transform: get_tilemap_center_transform(&size, &grid_size, 1.0),
             ..Default::default()

diff --git a/examples/basic.rs b/examples/basic.rs
@@ -53,7 +53,7 @@ fn startup(
             grid_size,
             size: tilemap_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
             ..Default::default()
@@ -77,13 +77,13 @@ fn swap_texture_or_hide(
     mut query: Query<(&mut TilemapTexture, &mut Visibility)>,
 ) {
     if keyboard_input.just_pressed(KeyCode::Space) {
-        let texture_handle_a: Handle<Image> = asset_server.load("tiles.png");
-        let texture_handle_b: Handle<Image> = asset_server.load("tiles2.png");
+        let texture_a = TilemapTexture::Single(asset_server.load("tiles.png"));
+        let texture_b = TilemapTexture::Single(asset_server.load("tiles2.png"));
         for (mut tilemap_tex, _) in &mut query {
-            if tilemap_tex.0 == texture_handle_a {
-                tilemap_tex.0 = texture_handle_b.clone();
+            if *tilemap_tex == texture_a {
+                *tilemap_tex = texture_b.clone();
             } else {
-                tilemap_tex.0 = texture_handle_a.clone();
+                *tilemap_tex = texture_a.clone();
             }
         }
     }

diff --git a/examples/bench.rs b/examples/bench.rs
@@ -33,7 +33,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             size: tilemap_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
             ..Default::default()

diff --git a/examples/chunking.rs b/examples/chunking.rs
@@ -45,7 +45,7 @@ fn spawn_chunk(commands: &mut Commands, asset_server: &AssetServer, chunk_pos: I
             grid_size: TILE_SIZE.into(),
             size: CHUNK_SIZE.into(),
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size: TILE_SIZE,
             transform,
             ..Default::default()

diff --git a/examples/colors.rs b/examples/colors.rs
@@ -83,7 +83,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             size: total_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             map_type: TilemapType::Square {
                 diagonal_neighbors: false,

diff --git a/examples/frustum_cull_test.rs b/examples/frustum_cull_test.rs
@@ -85,7 +85,7 @@ fn spawn_tilemap(mut commands: Commands, tile_handle_square: Res<TileHandleSquar
             grid_size,
             size: total_size,
             storage: tile_storage,
-            texture: TilemapTexture(tile_handle_square.clone()),
+            texture: TilemapTexture::Single(tile_handle_square.clone()),
             tile_size,
             map_type: TilemapType::Square {
                 diagonal_neighbors: false,
@@ -165,7 +165,7 @@ fn swap_map_type(
                         diagonal_neighbors: false,
                         coord_system: IsoCoordSystem::Diamond,
                     };
-                    *map_texture = TilemapTexture((*tile_handle_iso).clone());
+                    *map_texture = TilemapTexture::Single((*tile_handle_iso).clone());
                     *tile_size = TILE_SIZE_ISO;
                     *grid_size = GRID_SIZE_ISO;
                 }
@@ -177,7 +177,7 @@ fn swap_map_type(
                         diagonal_neighbors: false,
                         coord_system: IsoCoordSystem::Staggered,
                     };
-                    *map_texture = TilemapTexture((*tile_handle_iso).clone());
+                    *map_texture = TilemapTexture::Single((*tile_handle_iso).clone());
                     *tile_size = TILE_SIZE_ISO;
                     *grid_size = GRID_SIZE_ISO;
                 }
@@ -186,7 +186,7 @@ fn swap_map_type(
                     ..
                 } => {
                     *map_type = TilemapType::Hexagon(HexCoordSystem::Row);
-                    *map_texture = TilemapTexture((*tile_handle_hex_row).clone());
+                    *map_texture = TilemapTexture::Single((*tile_handle_hex_row).clone());
                     *tile_size = TILE_SIZE_HEX_ROW;
                     *grid_size = GRID_SIZE_HEX_ROW;
                 }
@@ -198,7 +198,7 @@ fn swap_map_type(
                 }
                 TilemapType::Hexagon(HexCoordSystem::RowOdd) => {
                     *map_type = TilemapType::Hexagon(HexCoordSystem::Column);
-                    *map_texture = TilemapTexture((*tile_handle_hex_col).clone());
+                    *map_texture = TilemapTexture::Single((*tile_handle_hex_col).clone());
                     *tile_size = TILE_SIZE_HEX_COL;
                     *grid_size = GRID_SIZE_HEX_COL;
                 }
@@ -212,7 +212,7 @@ fn swap_map_type(
                     *map_type = TilemapType::Square {
                         diagonal_neighbors: false,
                     };
-                    *map_texture = TilemapTexture((*tile_handle_square).clone());
+                    *map_texture = TilemapTexture::Single((*tile_handle_square).clone());
                     *tile_size = TILE_SIZE_SQUARE;
                     *grid_size = GRID_SIZE_SQUARE;
                 }

diff --git a/examples/game_of_life.rs b/examples/game_of_life.rs
@@ -39,7 +39,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             size: tilemap_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
             map_type: TilemapType::Square {

diff --git a/examples/helpers/tiled.rs b/examples/helpers/tiled.rs
@@ -230,7 +230,7 @@ pub fn process_loaded_maps(
                             grid_size,
                             size: map_size,
                             storage: tile_storage,
-                            texture: TilemapTexture(
+                            texture: TilemapTexture::Single(
                                 tiled_map
                                     .tilesets
                                     .get(&tileset.first_gid)

diff --git a/examples/hexagon_column.rs b/examples/hexagon_column.rs
@@ -79,7 +79,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             size: total_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             map_type: TilemapType::Hexagon(HexCoordSystem::Column),
             ..Default::default()

diff --git a/examples/hexagon_generation.rs b/examples/hexagon_generation.rs
@@ -76,7 +76,7 @@ fn spawn_tilemap(mut commands: Commands, tile_handle_hex_row: Res<TileHandleHexR
             grid_size,
             size: total_size,
             storage: tile_storage,
-            texture: TilemapTexture(tile_handle_hex_row.clone()),
+            texture: TilemapTexture::Single(tile_handle_hex_row.clone()),
             tile_size,
             map_type: TilemapType::Hexagon(hex_coord_system),
             ..Default::default()
@@ -170,11 +170,11 @@ fn swap_map_type(
             *map_type = TilemapType::Hexagon(new_coord_sys);
 
             if new_coord_sys == HexCoordSystem::Column {
-                *map_texture = TilemapTexture((*tile_handle_hex_col).clone());
+                *map_texture = TilemapTexture::Single((*tile_handle_hex_col).clone());
                 *tile_size = TILE_SIZE_HEX_COL;
                 *grid_size = GRID_SIZE_HEX_COL;
             } else if new_coord_sys == HexCoordSystem::Row {
-                *map_texture = TilemapTexture((*tile_handle_hex_row).clone());
+                *map_texture = TilemapTexture::Single((*tile_handle_hex_row).clone());
                 *tile_size = TILE_SIZE_HEX_ROW;
                 *grid_size = GRID_SIZE_HEX_ROW;
             }

diff --git a/examples/hexagon_row.rs b/examples/hexagon_row.rs
@@ -78,7 +78,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             size: total_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             map_type: TilemapType::Hexagon(HexCoordSystem::Row),
             ..Default::default()

diff --git a/examples/iso_diamond.rs b/examples/iso_diamond.rs
@@ -79,7 +79,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             size: total_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             map_type: TilemapType::isometric_diamond(false),
             ..Default::default()

diff --git a/examples/iso_staggered.rs b/examples/iso_staggered.rs
@@ -81,7 +81,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             size: total_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             map_type: TilemapType::isometric_staggered(false),
             ..Default::default()

diff --git a/examples/layers.rs b/examples/layers.rs
@@ -30,7 +30,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             size: tilemap_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle.clone()),
+            texture: TilemapTexture::Single(texture_handle.clone()),
             tile_size,
             transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
             ..Default::default()
@@ -54,7 +54,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size: grid_size,
             size: tilemap_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size: TilemapTileSize { x: 16.0, y: 16.0 },
             transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 1.0)
                 * Transform::from_xyz(32.0, 32.0, 0.0),

diff --git a/examples/ldtk/ldtk.rs b/examples/ldtk/ldtk.rs
@@ -207,7 +207,7 @@ pub fn process_loaded_tile_maps(
                             grid_size,
                             size,
                             storage,
-                            texture: TilemapTexture(texture),
+                            texture: TilemapTexture::Single(texture),
                             tile_size,
                             transform: get_tilemap_center_transform(
                                 &size,

diff --git a/examples/mouse_to_tile.rs b/examples/mouse_to_tile.rs
@@ -81,7 +81,7 @@ fn spawn_tilemap(mut commands: Commands, tile_handle_square: Res<TileHandleSquar
             grid_size,
             size: total_size,
             storage: tile_storage,
-            texture: TilemapTexture(tile_handle_square.clone()),
+            texture: TilemapTexture::Single(tile_handle_square.clone()),
             tile_size,
             map_type: TilemapType::Square {
                 diagonal_neighbors: false,
@@ -200,7 +200,7 @@ fn swap_map_type(
                         diagonal_neighbors: false,
                         coord_system: IsoCoordSystem::Diamond,
                     };
-                    *map_texture = TilemapTexture((*tile_handle_iso).clone());
+                    *map_texture = TilemapTexture::Single((*tile_handle_iso).clone());
                     *tile_size = TILE_SIZE_ISO;
                     *grid_size = GRID_SIZE_ISO;
                 }
@@ -212,7 +212,7 @@ fn swap_map_type(
                         diagonal_neighbors: false,
                         coord_system: IsoCoordSystem::Staggered,
                     };
-                    *map_texture = TilemapTexture((*tile_handle_iso).clone());
+                    *map_texture = TilemapTexture::Single((*tile_handle_iso).clone());
                     *tile_size = TILE_SIZE_ISO;
                     *grid_size = GRID_SIZE_ISO;
                 }
@@ -221,7 +221,7 @@ fn swap_map_type(
                     ..
                 } => {
                     *map_type = TilemapType::Hexagon(HexCoordSystem::Row);
-                    *map_texture = TilemapTexture((*tile_handle_hex_row).clone());
+                    *map_texture = TilemapTexture::Single((*tile_handle_hex_row).clone());
                     *tile_size = TILE_SIZE_HEX_ROW;
                     *grid_size = GRID_SIZE_HEX_ROW;
                 }
@@ -233,7 +233,7 @@ fn swap_map_type(
                 }
                 TilemapType::Hexagon(HexCoordSystem::RowOdd) => {
                     *map_type = TilemapType::Hexagon(HexCoordSystem::Column);
-                    *map_texture = TilemapTexture((*tile_handle_hex_col).clone());
+                    *map_texture = TilemapTexture::Single((*tile_handle_hex_col).clone());
                     *tile_size = TILE_SIZE_HEX_COL;
                     *grid_size = GRID_SIZE_HEX_COL;
                 }
@@ -247,7 +247,7 @@ fn swap_map_type(
                     *map_type = TilemapType::Square {
                         diagonal_neighbors: false,
                     };
-                    *map_texture = TilemapTexture((*tile_handle_square).clone());
+                    *map_texture = TilemapTexture::Single((*tile_handle_square).clone());
                     *tile_size = TILE_SIZE_SQUARE;
                     *grid_size = GRID_SIZE_SQUARE;
                 }

diff --git a/examples/move_tile.rs b/examples/move_tile.rs
@@ -36,7 +36,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             size: tilemap_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
             ..Default::default()

diff --git a/examples/neighbors.rs b/examples/neighbors.rs
@@ -73,7 +73,7 @@ fn spawn_tilemap(mut commands: Commands, tile_handle_hex_row: Res<TileHandleHexR
             grid_size,
             size: total_size,
             storage: tile_storage,
-            texture: TilemapTexture(tile_handle_hex_row.clone()),
+            texture: TilemapTexture::Single(tile_handle_hex_row.clone()),
             tile_size,
             map_type: TilemapType::Hexagon(HexCoordSystem::Row),
             ..Default::default()
@@ -191,7 +191,7 @@ fn swap_map_type(
                 }
                 TilemapType::Hexagon(HexCoordSystem::RowOdd) => {
                     *map_type = TilemapType::Hexagon(HexCoordSystem::Column);
-                    *map_texture = TilemapTexture((*tile_handle_hex_col).clone());
+                    *map_texture = TilemapTexture::Single((*tile_handle_hex_col).clone());
                     *tile_size = TILE_SIZE_HEX_COL;
                     *grid_size = GRID_SIZE_HEX_COL;
                 }
@@ -203,7 +203,7 @@ fn swap_map_type(
                 }
                 TilemapType::Hexagon(HexCoordSystem::ColumnOdd) => {
                     *map_type = TilemapType::Hexagon(HexCoordSystem::Row);
-                    *map_texture = TilemapTexture((*tile_handle_hex_row).clone());
+                    *map_texture = TilemapTexture::Single((*tile_handle_hex_row).clone());
                     *tile_size = TILE_SIZE_HEX_ROW;
                     *grid_size = GRID_SIZE_HEX_ROW;
                 }

diff --git a/examples/random_map.rs b/examples/random_map.rs
@@ -42,7 +42,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             size: tilemap_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
             ..Default::default()

diff --git a/examples/remove_tiles.rs b/examples/remove_tiles.rs
@@ -37,7 +37,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             size: tilemap_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
             ..Default::default()

diff --git a/examples/visibility.rs b/examples/visibility.rs
@@ -37,7 +37,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
             grid_size,
             size: tilemap_size,
             storage: tile_storage,
-            texture: TilemapTexture(texture_handle),
+            texture: TilemapTexture::Single(texture_handle),
             tile_size,
             transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
             ..Default::default()