fish-cannard/border-wars
fish-cannard/border-wars
5
3
Fork 0
generated from tipragot/rust
Code Issues 10 Pull requests 3 Actions Packages Projects Releases Wiki Activity

replace index for entity
Some checks failed
Rust Checks / checks (push) Failing after 2m43s
Details
Rust Checks / checks (pull_request) Failing after 3m34s
Details

Browse source
This commit is contained in:
CoCo_Sol 2024-03-13 07:37:34 +01:00
parent 419e36fb01
commit 9fe9e7fe2b
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
crates/border-wars/src/map/selected_tile.rs
View file

@ -7,9 +7,9 @@ use super::Tile;
/// The event that is triggered when a tile is clicked. /// The event that is triggered when a tile is clicked.
/// ///
/// The event contains the index (ID) of the clicked tile. /// The event contains the entity of the clicked tile.
#[derive(Event)] #[derive(Event)]
pub struct TileJustClicked(pub u32); pub struct TileJustClicked(pub Entity);
/// An event that is triggered when a mouse button is clicked. /// An event that is triggered when a mouse button is clicked.
/// ///
@ -25,8 +25,8 @@ pub struct ZoneNotClickable;
/// The currently selected tile. /// The currently selected tile.
#[derive(Resource, Default, Debug)] #[derive(Resource, Default, Debug)]
pub enum SelectedTile { pub enum SelectedTile {
/// The index (ID) of the selected tile. /// The entity of the selected tile.
Tile(u32), Tile(Entity),
/// Zero tile selected. /// Zero tile selected.
#[default] #[default]
@ -36,9 +36,9 @@ pub enum SelectedTile {
impl SelectedTile { impl SelectedTile {
/// Returns the index (ID) of the selected tile. /// Returns the index (ID) of the selected tile.
/// Returns `None` if no tile is selected. /// Returns `None` if no tile is selected.
pub const fn index(&self) -> Option<u32> { pub const fn get_entity(&self) -> Option<Entity> {
match self { match self {
Self::Tile(index) => Some(*index), Self::Tile(entity) => Some(*entity),
Self::None => None, Self::None => None,
} }
} }
@ -103,7 +103,7 @@ fn select_closest_tile(
mut click_event_reader: EventReader<ClickOnTheWorld>, mut click_event_reader: EventReader<ClickOnTheWorld>,
mut clicked_tile_event_writer: EventWriter<TileJustClicked>, mut clicked_tile_event_writer: EventWriter<TileJustClicked>,
tile_gap: Res<TilesGap>, tile_gap: Res<TilesGap>,
mut selected_tile: ResMut<SelectedTile>, mut current_entity: ResMut<SelectedTile>,
) { ) {
for click_event in click_event_reader.read() { for click_event in click_event_reader.read() {
// The closest tile and its distance to the cursor. // The closest tile and its distance to the cursor.
@ -129,12 +129,11 @@ fn select_closest_tile(
} }
} }
if let Some(tile_entity) = closest_entity { if let Some(tile_entity) = closest_entity {
let entity_index = tile_entity.index(); clicked_tile_event_writer.send(TileJustClicked(tile_entity.clone()));
clicked_tile_event_writer.send(TileJustClicked(entity_index)); if current_entity.get_entity() == Some(tile_entity) {
if selected_tile.index() == Some(entity_index) { *current_entity = SelectedTile::None;
*selected_tile = SelectedTile::None;
} else { } else {
*selected_tile = SelectedTile::Tile(entity_index); *current_entity = SelectedTile::Tile(tile_entity);
} }
} }
} }