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

Improve selection system #78

Merged
CoCo_Sol merged 14 commits from improve-selection into main 2024-03-19 15:08:43 +00:00
Conversation 0 Commits 14 Files changed 4 +11 -5
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 907f217058 - Show all commits

12
crates/border-wars/src/map/click_tile.rs
View file

@ -2,6 +2,7 @@
use bevy::prelude::*;
use super::renderer::TilesGap;
use super::Tile;
/// The event that is triggered when a tile is clicked.
@ -78,20 +79,25 @@ fn select_closest_tile(
tiles: Query<(Entity, &Transform, &Tile)>,
mut click_event_reader: EventReader<ClickOnTheWorld>,
mut clicked_tile_event_writer: EventWriter<TileJustClicked>,
gap_tiles: Res<TilesGap>,
) {
for click_event in click_event_reader.read() {
// The closest tile and its distance to the cursor.
let mut closest_entity: Option<Entity> = None;
let mut closest_position: Option<f32> = None;
// To keep the aspect ratio.
let click_position = click_event.0 / gap_tiles.0;
for (tile_entity, tile_transform, tile_type) in tiles.iter() {
let mut tile_position = tile_transform.translation.truncate();
let tile_size = tile_type.get_image_size();
let tile_scale = tile_transform.scale.truncate();
tile_position += (tile_size / 2.0) * tile_scale;
let mut tile_position = tile_transform.translation.truncate() / gap_tiles.0;
// The origine of the tile is the bottom center.
tile_position.y += (tile_size.y / 2.0) * tile_scale.y / gap_tiles.0.y;
let distance_to_cursor = tile_position.distance(click_event.0);
let distance_to_cursor = tile_position.distance(click_position);
if closest_position.is_none() || closest_position > Some(distance_to_cursor) {
closest_entity = Some(tile_entity);

4
crates/border-wars/src/map/renderer.rs
View file

@ -21,7 +21,7 @@ impl Plugin for RendererPlugin {
/// The gap between the center of the tiles in the map.
#[derive(Resource)]
struct TilesGap(Vec2);
pub struct TilesGap(pub Vec2);
/// The size of the tiles in the map.
#[derive(Resource, Clone, Copy)]
@ -81,7 +81,7 @@ fn render_map(
commands.entity(entity).insert(SpriteBundle {
sprite: Sprite {
anchor: Anchor::BottomLeft,
anchor: Anchor::BottomCenter,
..default()
},
texture,