Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix how tilemap center is calculated so that it works for all map types. #324

Merged
merged 1 commit into from
Oct 26, 2022
Merged

Fix how tilemap center is calculated so that it works for all map types. #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions examples/accessing_tiles.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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 {
let map_type = TilemapType::Square {
diagonal_neighbors: true,
};

Expand Down Expand Up @@ -53,7 +53,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
}

// We can grab a list of neighbors.
let neighbors = get_tile_neighbors(&TilePos { x: 0, y: 0 }, &tile_storage, &tilemap_type);
let neighbors = get_tile_neighbors(&TilePos { x: 0, y: 0 }, &tile_storage, &map_type);

// We can access tiles using:
assert!(tile_storage.get(&TilePos { x: 0, y: 0 }).is_some());
Expand All @@ -65,7 +65,7 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
color += 1;
for y in (2..128).step_by(4) {
// Grabbing neighbors is easy.
let neighbors = get_neighboring_pos(&TilePos { x, y }, &tilemap_size, &tilemap_type);
let neighbors = get_neighboring_pos(&TilePos { x, y }, &tilemap_size, &map_type);
for pos in neighbors.into_iter() {
// We can replace the tile texture component like so:
commands
Expand All @@ -87,10 +87,10 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
grid_size,
size: tilemap_size,
storage: tile_storage,
map_type: tilemap_type,
map_type,
texture: TilemapTexture::Single(texture_handle),
tile_size,
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 0.0),
..Default::default()
})
.insert(LastUpdate(0.0))
Expand Down
16 changes: 12 additions & 4 deletions examples/animation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,18 @@ fn create_background(mut commands: Commands, asset_server: Res<AssetServer>) {
&mut tile_storage,
);

let map_type = TilemapType::default();

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
size,
grid_size,
map_type,
tile_size,
storage: tile_storage,
texture: TilemapTexture::Single(texture_handle),
transform: get_tilemap_center_transform(&size, &grid_size, 0.0),
transform: get_tilemap_center_transform(&size, &grid_size, &map_type, 0.0),
..Default::default()
});
}
Expand Down Expand Up @@ -108,15 +111,20 @@ fn create_animated_flowers(mut commands: Commands, asset_server: Res<AssetServer
});
}

let map_type = TilemapType::Square {
diagonal_neighbors: false,
};

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size,
size,
grid_size,
map_type,
tile_size,
storage: tile_storage,
texture: TilemapTexture::Single(texture_handle),
tile_size,
transform: get_tilemap_center_transform(&size, &grid_size, 1.0),
transform: get_tilemap_center_transform(&size, &grid_size, &map_type, 1.0),
..Default::default()
});
}
Expand Down
4 changes: 3 additions & 1 deletion examples/basic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,18 @@ fn startup(

let tile_size = TilemapTileSize { x: 16.0, y: 16.0 };
let grid_size = tile_size.into();
let map_type = TilemapType::default();

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size,
map_type,
size: tilemap_size,
storage: tile_storage,
texture: TilemapTexture::Single(texture_handle),
tile_size,
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 0.0),
..Default::default()
});

Expand Down
4 changes: 3 additions & 1 deletion examples/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,18 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {

let tile_size = TilemapTileSize { x: 16.0, y: 16.0 };
let grid_size = tile_size.into();
let map_type = TilemapType::default();

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size,
map_type,
size: tilemap_size,
storage: tile_storage,
texture: TilemapTexture::Single(texture_handle),
tile_size,
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 0.0),
..Default::default()
});
}
Expand Down
9 changes: 5 additions & 4 deletions examples/game_of_life.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,20 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {

let tile_size = TilemapTileSize { x: 16.0, y: 16.0 };
let grid_size = tile_size.into();
let map_type = TilemapType::Square {
diagonal_neighbors: true,
};

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size,
map_type,
size: tilemap_size,
storage: tile_storage,
texture: TilemapTexture::Single(texture_handle),
tile_size,
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
map_type: TilemapType::Square {
diagonal_neighbors: true,
},
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 0.0),
..Default::default()
})
.insert(LastUpdate(0.0));
Expand Down
5 changes: 3 additions & 2 deletions examples/helpers/tiled.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ pub fn process_loaded_maps(
y: tiled_map.map.tile_height as f32,
};

let mesh_type = match tiled_map.map.orientation {
let map_type = match tiled_map.map.orientation {
tiled::Orientation::Hexagonal => {
TilemapType::Hexagon(HexCoordSystem::Row)
}
Expand Down Expand Up @@ -242,9 +242,10 @@ pub fn process_loaded_maps(
transform: get_tilemap_center_transform(
&map_size,
&grid_size,
&map_type,
layer.layer_index as f32,
) * Transform::from_xyz(offset_x, -offset_y, 0.0),
map_type: mesh_type,
map_type,
..Default::default()
});

Expand Down
9 changes: 6 additions & 3 deletions examples/layers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,18 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {

let tile_size = TilemapTileSize { x: 16.0, y: 16.0 };
let grid_size = tile_size.into();
let map_type = TilemapType::default();

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size,
map_type,
size: tilemap_size,
storage: tile_storage,
texture: TilemapTexture::Single(texture_handle.clone()),
tile_size,
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 0.0),
..Default::default()
});

Expand All @@ -51,12 +53,13 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size: grid_size,
grid_size,
map_type,
size: tilemap_size,
storage: tile_storage,
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: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 1.0)
* Transform::from_xyz(32.0, 32.0, 0.0),
..Default::default()
});
Expand Down
4 changes: 4 additions & 0 deletions examples/ldtk/ldtk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use bevy::{
asset::{AssetLoader, AssetPath, BoxedFuture, LoadContext, LoadedAsset},
prelude::*,
};
use bevy_ecs_tilemap::map::TilemapType;

#[derive(Default)]
pub struct LdtkPlugin;
Expand Down Expand Up @@ -201,17 +202,20 @@ pub fn process_loaded_tile_maps(
}

let grid_size = tile_size.into();
let map_type = TilemapType::default();

// Create the tilemap
commands.entity(map_entity).insert_bundle(TilemapBundle {
grid_size,
map_type,
size,
storage,
texture: TilemapTexture::Single(texture),
tile_size,
transform: get_tilemap_center_transform(
&size,
&grid_size,
&map_type,
layer_id as f32,
),
..default()
Expand Down
4 changes: 3 additions & 1 deletion examples/move_tile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,18 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {

let tile_size = TilemapTileSize { x: 16.0, y: 16.0 };
let grid_size = tile_size.into();
let map_type = TilemapType::default();

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size,
map_type,
size: tilemap_size,
storage: tile_storage,
texture: TilemapTexture::Single(texture_handle),
tile_size,
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 0.0),
..Default::default()
});
}
Expand Down
5 changes: 3 additions & 2 deletions examples/random_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,17 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {

let tile_size = TilemapTileSize { x: 16.0, y: 16.0 };
let grid_size = tile_size.into();

let map_type = TilemapType::default();
commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size,
map_type,
size: tilemap_size,
storage: tile_storage,
texture: TilemapTexture::Single(texture_handle),
tile_size,
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 0.0),
..Default::default()
});
}
Expand Down
4 changes: 3 additions & 1 deletion examples/remove_tiles.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,18 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {

let tile_size = TilemapTileSize { x: 16.0, y: 16.0 };
let grid_size = tile_size.into();
let map_type = TilemapType::default();

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size,
map_type,
size: tilemap_size,
storage: tile_storage,
texture: TilemapTexture::Single(texture_handle),
tile_size,
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 0.0),
..Default::default()
})
.insert(LastUpdate::default());
Expand Down
11 changes: 8 additions & 3 deletions examples/spacing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,19 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {

let tile_size = TilemapTileSize { x: 16.0, y: 16.0 };
let grid_size = tile_size.into();
let map_type = TilemapType::default();

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size,
map_type,
size: tilemap_size,
storage: tile_storage,
texture: TilemapTexture::Single(texture_handle.clone()),
tile_size,
spacing: TilemapSpacing { x: 8.0, y: 8.0 },
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 0.0),
..Default::default()
});

Expand All @@ -49,15 +51,18 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
&mut tile_storage,
);

let map_type = TilemapType::default();

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size: grid_size,
grid_size,
map_type,
size: tilemap_size,
storage: tile_storage,
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: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 1.0)
* Transform::from_xyz(32.0, 32.0, 0.0),
..Default::default()
});
Expand Down
5 changes: 3 additions & 2 deletions examples/texture_container.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,18 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {

let tile_size = TILE_SIZE;
let grid_size = TILE_SIZE.into();
let map_type = TilemapType::Hexagon(COORD_SYS);

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size,
map_type,
tile_size,
size: map_size,
storage: tile_storage,
texture: texture_vec,
map_type: TilemapType::Hexagon(COORD_SYS),
transform: get_tilemap_center_transform(&map_size, &grid_size, 0.0),
transform: get_tilemap_center_transform(&map_size, &grid_size, &map_type, 0.0),
..Default::default()
});
}
Expand Down
5 changes: 3 additions & 2 deletions examples/texture_vec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,18 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {

let tile_size = TILE_SIZE;
let grid_size = TILE_SIZE.into();
let map_type = TilemapType::Hexagon(COORD_SYS);

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size,
map_type,
tile_size,
size: map_size,
storage: tile_storage,
texture: texture_vec,
map_type: TilemapType::Hexagon(COORD_SYS),
transform: get_tilemap_center_transform(&map_size, &grid_size, 0.0),
transform: get_tilemap_center_transform(&map_size, &grid_size, &map_type, 0.0),
..Default::default()
});
}
Expand Down
4 changes: 3 additions & 1 deletion examples/visibility.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,18 @@ fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {

let tile_size = TilemapTileSize { x: 16.0, y: 16.0 };
let grid_size = tile_size.into();
let map_type = TilemapType::default();

commands
.entity(tilemap_entity)
.insert_bundle(TilemapBundle {
grid_size,
map_type,
size: tilemap_size,
storage: tile_storage,
texture: TilemapTexture::Single(texture_handle),
tile_size,
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, 0.0),
transform: get_tilemap_center_transform(&tilemap_size, &grid_size, &map_type, 0.0),
..Default::default()
})
.insert(LastUpdate::default());
Expand Down
Loading