change input system

Author: feschber

solitaire-game/src/board.rs

@@ -1,3 +1,5 @@
+use std::ops::{Add, Mul, Sub};
+
 use bevy::{ecs::entity_disabling::Disabled, prelude::*};
 use bevy_vector_shapes::{prelude::ShapePainter, shapes::DiscPainter};
 use solitaire_solver::{Board, Idx};
@@ -36,6 +38,36 @@ pub struct BoardPosition {
     pub y: Idx,
 }
 
+impl Sub for BoardPosition {
+    type Output = Self;
+
+    fn sub(self, rhs: Self) -> Self::Output {
+        let x = self.x - rhs.x;
+        let y = self.y - rhs.y;
+        Self { x, y }
+    }
+}
+
+impl Add for BoardPosition {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        let x = self.x + rhs.x;
+        let y = self.y + rhs.y;
+        Self { x, y }
+    }
+}
+
+impl Mul<Idx> for BoardPosition {
+    type Output = Self;
+
+    fn mul(self, rhs: Idx) -> Self::Output {
+        let x = self.x * rhs;
+        let y = self.y * rhs;
+        Self { x, y }
+    }
+}
+
 #[derive(Event)]
 struct MovePeg {
     mov: solitaire_solver::Move,

solitaire-game/src/input.rs

@@ -3,7 +3,6 @@ use bevy::{
     prelude::*,
     window::PrimaryWindow,
 };
-use solitaire_solver::Board;
 
 use crate::{
     Selected,
@@ -44,10 +43,8 @@ fn grab_peg(
     if let Some(cursor_pos) = window.cursor_position() {
         if let Some(world_pos_cursor) = viewport_to_world(cursor_pos, camera, camera_transform) {
             let board_pos = BoardPosition::from_world_space(world_pos_cursor.xy());
-            if Board::inbounds(board_pos.into()) {
-                if let Some(peg) = pegs.iter().find(|(_, p)| **p == board_pos).map(|(p, _)| p) {
-                    commands.entity(peg).insert(Selected);
-                }
+            if let Some(peg) = pegs.iter().find(|(_, p)| **p == board_pos).map(|(p, _)| p) {
+                commands.entity(peg).insert(Selected);
             }
         };
     }
@@ -64,11 +61,7 @@ fn release_peg(
         if let Some(world_pos_cursor) = viewport_to_world(cursor_pos, camera, camera_transform) {
             let board_pos = BoardPosition::from_world_space(world_pos_cursor.xy());
             for (selected_peg, &current_pos) in selected_pegs {
-                commands.entity(selected_peg).remove::<Selected>();
-                commands.trigger(RequestPegMove {
-                    src: current_pos,
-                    dst: board_pos,
-                });
+                move_peg(&mut commands, selected_peg, current_pos, board_pos);
             }
         };
     }
@@ -85,23 +78,37 @@ fn peg_selection_touch(
     for touch in touches.iter_just_pressed() {
         if let Some(world_pos) = viewport_to_world(touch.position(), camera, camera_transform) {
             let board_pos = BoardPosition::from_world_space(world_pos.xy());
-            if Board::inbounds(board_pos.into()) {
-                if let Some(peg) = pegs.iter().find(|(_, p)| **p == board_pos).map(|(p, _)| p) {
-                    commands.entity(peg).insert(Selected);
-                }
+            if let Some(peg) = pegs.iter().find(|(_, p)| **p == board_pos).map(|(p, _)| p) {
+                commands.entity(peg).insert(Selected);
             }
         }
     }
     for touch in touches.iter_just_released() {
         if let Some(world_pos) = viewport_to_world(touch.position(), camera, camera_transform) {
             let board_pos = BoardPosition::from_world_space(world_pos.xy());
             for (selected_peg, &current_pos) in selected_pegs {
-                commands.entity(selected_peg).remove::<Selected>();
-                commands.trigger(RequestPegMove {
-                    src: current_pos,
-                    dst: board_pos,
-                });
+                move_peg(&mut commands, selected_peg, current_pos, board_pos);
             }
         }
     }
 }
+
+fn move_peg(commands: &mut Commands, selected: Entity, src: BoardPosition, dst: BoardPosition) {
+    let diff = dst - src;
+    let diff = BoardPosition {
+        x: if diff.x == 0 { 0 } else { diff.x.signum() },
+        y: if diff.y == 0 { 0 } else { diff.y.signum() },
+    };
+    if diff.x > diff.y {
+        commands.trigger(RequestPegMove {
+            src,
+            dst: src + diff * 2,
+        });
+    } else if diff.y > diff.x {
+        commands.trigger(RequestPegMove {
+            src: src,
+            dst: src + diff * 2,
+        });
+    }
+    commands.entity(selected).remove::<Selected>();
+}