CrispyPin/marble-machinations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make [copy, paste, menu, start, stop] use new input system

Browse source
This commit is contained in:
Crispy 2025-03-30 15:23:37 +02:00
parent 70fd50d3bc
commit 3548679bbb
2 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/editor.rs
View file

@ -458,7 +458,7 @@ impl Editor {
self.mouse.clear(); self.mouse.clear();
} }
if rl.is_key_pressed(KeyboardKey::KEY_ESCAPE) { if globals.input.is_pressed(ActionId::ToggleMenu) {
self.popup = match self.popup { self.popup = match self.popup {
Popup::Success | Popup::Failure => { Popup::Success | Popup::Failure => {
self.dismissed_end = true; self.dismissed_end = true;
@ -499,17 +499,22 @@ impl Editor {
if globals.input.is_pressed(ActionId::StepSim) { if globals.input.is_pressed(ActionId::StepSim) {
self.step_pressed() self.step_pressed()
} }
if rl.is_key_pressed(KeyboardKey::KEY_ENTER) { if globals.input.is_pressed(ActionId::StartSim) {
match self.sim_state { match self.sim_state {
SimState::Editing => { SimState::Editing => {
self.init_sim(); self.init_sim();
self.sim_state = SimState::Running; self.sim_state = SimState::Running;
} }
SimState::Running => { SimState::Stepping => self.sim_state = SimState::Running,
SimState::Running => (),
}
} else if globals.input.is_pressed(ActionId::StopSim) {
match self.sim_state {
SimState::Running | SimState::Stepping => {
self.sim_state = SimState::Editing; self.sim_state = SimState::Editing;
self.popup = Popup::None; self.popup = Popup::None;
} }
SimState::Stepping => self.sim_state = SimState::Running, SimState::Editing => (),
} }
} }
@ -552,9 +557,7 @@ impl Editor {
if self.sim_state == SimState::Editing { if self.sim_state == SimState::Editing {
if let Some(clipboard) = &mut globals.clipboard { if let Some(clipboard) = &mut globals.clipboard {
if rl.is_key_down(KeyboardKey::KEY_LEFT_CONTROL) if globals.input.is_pressed(ActionId::Paste) {
&& rl.is_key_pressed(KeyboardKey::KEY_V)
{
if let Ok(text) = clipboard.get_text() { if let Ok(text) = clipboard.get_text() {
let b = Board::from_user_str(&text); let b = Board::from_user_str(&text);
self.pasting_board = Some(b); self.pasting_board = Some(b);
@ -1042,8 +1045,7 @@ impl Editor {
self.tooltip.add(188, y, 40, 40, "Copy"); self.tooltip.add(188, y, 40, 40, "Copy");
if simple_button((d, &self.mouse), 188, y, 40, 40) if simple_button((d, &self.mouse), 188, y, 40, 40)
|| (d.is_key_pressed(KeyboardKey::KEY_C) || globals.input.is_pressed(ActionId::Copy)
&& d.is_key_down(KeyboardKey::KEY_LEFT_CONTROL))
{ {
let board = self.get_selected_as_board(selection); let board = self.get_selected_as_board(selection);
if let Some(clipboard) = &mut globals.clipboard { if let Some(clipboard) = &mut globals.clipboard {

22
src/input.rs
View file

@ -1,4 +1,4 @@
use std::{collections::HashMap, mem::transmute}; use std::{collections::BTreeMap, mem::transmute};
use raylib::{ use raylib::{
ffi::{KeyboardKey, MouseButton}, ffi::{KeyboardKey, MouseButton},
@ -6,13 +6,18 @@ use raylib::{
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord, Hash)] #[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord)]
#[repr(u8)] #[repr(u8)]
pub enum ActionId { pub enum ActionId {
StepSim,
Undo, Undo,
Redo, Redo,
// just like in C, because this way doesn't need more depenedencies Copy,
Paste,
ToggleMenu,
StartSim,
StopSim,
StepSim,
// just like in C, because this way doesn't need more dependencies
_ActionIdSize, _ActionIdSize,
} }
@ -26,9 +31,14 @@ impl Default for Input {
trigger: InputTrigger::Key(key), trigger: InputTrigger::Key(key),
}]; }];
}; };
bind_key(ActionId::StepSim, vec![], KEY_SPACE);
bind_key(ActionId::Undo, vec![KEY_LEFT_CONTROL], KEY_Z); bind_key(ActionId::Undo, vec![KEY_LEFT_CONTROL], KEY_Z);
bind_key(ActionId::Redo, vec![KEY_LEFT_CONTROL], KEY_Y); bind_key(ActionId::Redo, vec![KEY_LEFT_CONTROL], KEY_Y);
bind_key(ActionId::Copy, vec![KEY_LEFT_CONTROL], KEY_C);
bind_key(ActionId::Paste, vec![KEY_LEFT_CONTROL], KEY_V);
bind_key(ActionId::ToggleMenu, vec![], KEY_ESCAPE);
bind_key(ActionId::StartSim, vec![], KEY_ENTER);
bind_key(ActionId::StopSim, vec![], KEY_ENTER);
bind_key(ActionId::StepSim, vec![], KEY_SPACE);
Self { Self {
bindings, bindings,
@ -46,7 +56,7 @@ enum BindingState {
Released, Released,
} }
type InputMap = HashMap<ActionId, Vec<Binding>>; type InputMap = BTreeMap<ActionId, Vec<Binding>>;
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(from = "InputMap", into = "InputMap")] #[serde(from = "InputMap", into = "InputMap")]