From ef0771d67ca4b50a10c140ec8fb6bd24f05958d6 Mon Sep 17 00:00:00 2001
From: Silas Bartha <silas@exvacuum.dev>
Date: Wed, 31 Jul 2024 11:44:07 -0400
Subject: Add "just pressed" input tracking

---
 src/input/resources.rs | 40 +++++++++++++++++++++++-----------------
 src/input/systems.rs   |  5 +++--
 2 files changed, 26 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/input/resources.rs b/src/input/resources.rs
index afe6353..ba2f6dd 100644
--- a/src/input/resources.rs
+++ b/src/input/resources.rs
@@ -1,4 +1,4 @@
-use bevy::{prelude::*, utils::HashSet};
+use bevy::{prelude:: *, utils::HashSet};
 use crossterm::event::{Event, KeyCode};
 use std::sync::{Arc, Mutex};
 
@@ -6,7 +6,8 @@ use std::sync::{Arc, Mutex};
 #[derive(Resource, Default)]
 pub struct TerminalInput {
     pressed_keys: HashSet<KeyCode>,
-    released_keys: HashSet<KeyCode>,
+    just_pressed_keys: HashSet<KeyCode>,
+    just_released_keys: HashSet<KeyCode>,
 }
 
 impl TerminalInput {
@@ -15,31 +16,36 @@ impl TerminalInput {
         self.pressed_keys.contains(&code)
     }
 
-    /// Gets whether the given key is released
-    pub fn is_released(&self, code: KeyCode) -> bool {
-        self.released_keys.contains(&code)
+    /// Gets whether the given key was just pressed
+    pub fn just_pressed(&self, code: KeyCode) -> bool {
+        self.just_pressed_keys.contains(&code)
+    }
+
+    /// Gets whether the given key was just released
+    pub fn just_released(&self, code: KeyCode) -> bool {
+        self.just_released_keys.contains(&code)
     }
 
     /// Sets given key to pressed
     pub(super) fn press(&mut self, code: KeyCode) {
-        if !self.is_pressed(code) {
-            self.pressed_keys.insert(code);
-        }
+        self.pressed_keys.insert(code);
+        self.just_pressed_keys.insert(code);
     }
 
     /// Sets given key to released and removes pressed state
     pub(super) fn release(&mut self, code: KeyCode) {
-        if self.is_pressed(code) {
-            self.pressed_keys.remove(&code);
-        }
-        if !self.is_released(code) {
-            self.released_keys.insert(code);
-        }
+        self.pressed_keys.remove(&code);
+        self.just_released_keys.insert(code);
     }
 
-    /// Clears all released keys
-    pub(super) fn clear_released(&mut self) {
-        self.released_keys.clear();
+    /// Clears all just released keys
+    pub(super) fn clear_just_released(&mut self) {
+        self.just_released_keys.clear();
+    }
+    
+    /// Clears all just pressed keys
+    pub(super) fn clear_just_pressed(&mut self) {
+        self.just_pressed_keys.clear();
     }
 }
 
diff --git a/src/input/systems.rs b/src/input/systems.rs
index 9560e1e..9be9f25 100644
--- a/src/input/systems.rs
+++ b/src/input/systems.rs
@@ -29,7 +29,8 @@ pub fn input_handling(
     mut input: ResMut<TerminalInput>,
     mut event_writer: EventWriter<TerminalInputEvent>,
 ) {
-    input.clear_released();
+    input.clear_just_released();
+    input.clear_just_pressed();
     let mut event_queue = event_queue.0.lock().unwrap();
     let mut key_events = Vec::<KeyEvent>::new();
     while let Some(event) = event_queue.pop() {
@@ -51,4 +52,4 @@ pub fn input_handling(
             _ => (),
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3