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

add step button

Browse source
This commit is contained in:
Crispy 2024-10-07 12:57:32 +02:00
parent 28a54a231b
commit 2c27d660b3
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
assets/step.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 191 B

34
src/editor.rs
View file

@ -128,6 +128,18 @@ impl Editor {
self.machine.set_board(self.source_board.clone()); self.machine.set_board(self.source_board.clone());
} }
fn step_pressed(&mut self){
match self.sim_state {
SimState::Editing => {
self.start_sim();
self.step();
}
SimState::Running => (),
SimState::Stepping => self.step(),
}
self.sim_state = SimState::Stepping;
}
fn step(&mut self) { fn step(&mut self) {
self.machine.step(); self.machine.step();
if !self.level.outputs().is_empty() if !self.level.outputs().is_empty()
@ -211,15 +223,7 @@ impl Editor {
} }
} }
if rl.is_key_pressed(KeyboardKey::KEY_SPACE) { if rl.is_key_pressed(KeyboardKey::KEY_SPACE) {
match self.sim_state { self.step_pressed()
SimState::Editing => {
self.start_sim();
self.step();
}
SimState::Running => (),
SimState::Stepping => self.step(),
}
self.sim_state = SimState::Stepping;
} }
if rl.is_key_pressed(KeyboardKey::KEY_ENTER) { if rl.is_key_pressed(KeyboardKey::KEY_ENTER) {
match self.sim_state { match self.sim_state {
@ -392,24 +396,28 @@ impl Editor {
self.sim_state = SimState::Stepping; self.sim_state = SimState::Stepping;
} }
draw_scaled_texture(d, textures.get("pause"), 260, 4, 2.); draw_scaled_texture(d, textures.get("pause"), 260, 4, 2.);
if simple_button(d, 260 + 36, 4, 32, 32) { if simple_button(d, 296, 4, 32, 32) {
self.sim_state = SimState::Editing; self.sim_state = SimState::Editing;
self.complete_popup = Popup::Start; self.complete_popup = Popup::Start;
} }
draw_scaled_texture(d, textures.get("stop"), 260 + 36, 4, 2.); draw_scaled_texture(d, textures.get("stop"), 296, 4, 2.);
} }
SimState::Stepping => { SimState::Stepping => {
if simple_button(d, 260, 4, 32, 32) { if simple_button(d, 260, 4, 32, 32) {
self.sim_state = SimState::Running; self.sim_state = SimState::Running;
} }
draw_scaled_texture(d, textures.get("play"), 260, 4, 2.); draw_scaled_texture(d, textures.get("play"), 260, 4, 2.);
if simple_button(d, 260 + 36, 4, 32, 32) { if simple_button(d, 296, 4, 32, 32) {
self.sim_state = SimState::Editing; self.sim_state = SimState::Editing;
self.complete_popup = Popup::Start; self.complete_popup = Popup::Start;
} }
draw_scaled_texture(d, textures.get("stop"), 260 + 36, 4, 2.); draw_scaled_texture(d, textures.get("stop"), 296, 4, 2.);
} }
} }
if simple_button(d, 332, 4, 32, 32) {
self.step_pressed();
}
draw_scaled_texture(d, textures.get("step"), 332, 4, 2.);
let mut input_text = String::from_utf8_lossy(self.machine.input()).to_string(); let mut input_text = String::from_utf8_lossy(self.machine.input()).to_string();
let width = d.get_screen_width(); let width = d.get_screen_width();