From edb12e4dc589e8bb4bd3753c910cce7b0c214b19 Mon Sep 17 00:00:00 2001
From: Jordan Orelli <jordanorelli@gmail.com>
Date: Tue, 6 Sep 2022 16:44:40 -0500
Subject: [PATCH] reorganize stuff

---
 assets/unknown-tile.png | Bin 0 -> 3724 bytes
 src/input.rs            |  59 ++++++++++++++++++++++++++++++++++++++++
 src/main.rs             |  46 ++++++++++++-------------------
 3 files changed, 77 insertions(+), 28 deletions(-)
 create mode 100644 assets/unknown-tile.png
 create mode 100644 src/input.rs

diff --git a/assets/unknown-tile.png b/assets/unknown-tile.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2746d705c4b5cb5621cb6b4737a26d8edd7203d
GIT binary patch
literal 3724
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

literal 0
HcmV?d00001

diff --git a/src/input.rs b/src/input.rs
new file mode 100644
index 0000000..57810ee
--- /dev/null
+++ b/src/input.rs
@@ -0,0 +1,59 @@
+use bevy::{
+    input::{keyboard::KeyCode, Input},
+    prelude::*,
+};
+
+#[derive(Default, Debug)]
+pub struct PlayerInput {
+    pub up:    ButtonState,
+    pub down:  ButtonState,
+    pub left:  ButtonState,
+    pub right: ButtonState,
+}
+
+impl PlayerInput {
+    pub fn clear(&mut self) {
+        self.up.release();
+        self.down.release();
+        self.left.release();
+        self.right.release();
+    }
+
+    pub fn update(&mut self, input: &Input<KeyCode>) {
+        self.clear();
+        self.up.set_from(&input, KeyCode::W);
+        self.up.set_from(&input, KeyCode::Up);
+        self.left.set_from(&input, KeyCode::A);
+        self.left.set_from(&input, KeyCode::Left);
+        self.down.set_from(&input, KeyCode::S);
+        self.down.set_from(&input, KeyCode::Down);
+        self.right.set_from(&input, KeyCode::D);
+        self.right.set_from(&input, KeyCode::Right);
+    }
+
+}
+
+#[derive(Default, Debug)]
+pub struct ButtonState {
+    pub pressed: bool,
+    pub held:    bool,
+}
+
+impl ButtonState {
+    fn release(&mut self) {
+        self.pressed = false;
+        self.held = false;
+    }
+
+    fn set_from(&mut self, input: &Input<KeyCode>, key: KeyCode) {
+        if input.just_pressed(key) {
+            self.pressed = true;
+            self.held = true;
+        }
+
+        if input.pressed(key) {
+            self.held = true;
+        }
+    }
+}
+
diff --git a/src/main.rs b/src/main.rs
index 921be08..ce9fa95 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,12 @@
+mod input;
+
 use bevy::{
     input::{keyboard::KeyCode, Input},
     prelude::*,
 };
 
+use input::{PlayerInput, ButtonState};
+
 #[derive(Component)]
 struct Player;
 
@@ -51,44 +55,29 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 
 }
 
-
-fn map_key(now: &Res<Input<KeyCode>>, key: KeyCode, handler: &mut bool) {
-    *handler = now.just_pressed(key);
-    // if now.just_pressed(key)  { *handler = true; }
-    // if now.just_released(key) { *handler = false; }
+/// player_keyboard_input is a system that maps keyboard key presses to the player's input state
+fn player_keyboard_input(now: Res<Input<KeyCode>>, mut input_state: ResMut<PlayerInput>) {
+    input_state.update(&now);
 }
 
-fn keyboard_input(now: Res<Input<KeyCode>>, mut input_state: ResMut<PlayerInput>) {
-    map_key(&now, KeyCode::W, &mut input_state.up);
-    map_key(&now, KeyCode::Up, &mut input_state.up);
-
-    map_key(&now, KeyCode::A, &mut input_state.left);
-    map_key(&now, KeyCode::Left, &mut input_state.left);
-
-    map_key(&now, KeyCode::S, &mut input_state.down);
-    map_key(&now, KeyCode::Down, &mut input_state.down);
-
-    map_key(&now, KeyCode::D, &mut input_state.right);
-    map_key(&now, KeyCode::Right, &mut input_state.right);
+fn debug_input(now: Res<Input<KeyCode>>, mut debug_state: ResMut<DebugView>) {
 }
 
 fn player_movement(
     mut query: Query<&mut Transform, With<Player>>,
-    input_state: Res<PlayerInput>
+    input_state: Res<PlayerInput>,
+    tile: Res<TileSize>,
 ) {
     let mut player_t = query.single_mut();
-    if input_state.up    { player_t.translation.y += 32.0; }
-    if input_state.down  { player_t.translation.y -= 32.0; }
-    if input_state.left  { player_t.translation.x -= 32.0; }
-    if input_state.right { player_t.translation.x += 32.0; }
+    if input_state.up.pressed    { player_t.translation.y += tile.height as f32; }
+    if input_state.down.pressed  { player_t.translation.y -= tile.height as f32; }
+    if input_state.left.pressed  { player_t.translation.x -= tile.width as f32; }
+    if input_state.right.pressed { player_t.translation.x += tile.width as f32; }
 }
 
 #[derive(Default, Debug)]
-struct PlayerInput {
-    up:    bool,
-    down:  bool,
-    left:  bool,
-    right: bool,
+struct DebugView {
+    enabled: bool,
 }
 
 fn main() {
@@ -96,9 +85,10 @@ fn main() {
         .add_plugins(DefaultPlugins)
         .insert_resource(ClearColor(BACKGROUND_COLOR))
         .insert_resource(PlayerInput::default())
+        .insert_resource(DebugView::default())
         .insert_resource(TileSize{width: TILE_WIDTH, height: TILE_HEIGHT})
         .add_startup_system(setup)
-        .add_system(keyboard_input)
+        .add_system(player_keyboard_input)
         .add_system(player_movement)
         .add_system(bevy::window::close_on_esc)
         .run();