allow removing rules

This commit is contained in:
Crispy 2024-05-01 23:15:44 +02:00
parent 79cd0a8fe4
commit c435d96f33
2 changed files with 13 additions and 3 deletions

View file

@ -112,7 +112,9 @@ impl Dish {
} }
pub fn fire_blindly(&mut self) { pub fn fire_blindly(&mut self) {
assert!(!self.rules.is_empty()); if self.rules.is_empty() {
return;
}
let x = random::<usize>() % CHUNK_SIZE; let x = random::<usize>() % CHUNK_SIZE;
let y = random::<usize>() % CHUNK_SIZE; let y = random::<usize>() % CHUNK_SIZE;
let rule = random::<usize>() % self.rules.len(); let rule = random::<usize>() % self.rules.len();

View file

@ -61,6 +61,7 @@ impl eframe::App for UScope {
ui.color_edit_button_srgba(&mut cell.color); ui.color_edit_button_srgba(&mut cell.color);
}); });
} }
if ui.button("add cell").clicked() { if ui.button("add cell").clicked() {
let h = random::<f32>(); let h = random::<f32>();
let s = random::<f32>() * 0.5 + 0.5; let s = random::<f32>() * 0.5 + 0.5;
@ -70,9 +71,16 @@ impl eframe::App for UScope {
self.celltypes.push(CellData { name, color }) self.celltypes.push(CellData { name, color })
} }
ui.heading("Rules"); ui.heading("Rules");
for rule in &mut self.dish.rules { let mut to_remove = None;
for (i, rule) in self.dish.rules.iter_mut().enumerate() {
if ui.button("x").clicked() {
to_remove = Some(i);
}
rule_editor(ui, rule, &self.celltypes); rule_editor(ui, rule, &self.celltypes);
} }
if let Some(i) = to_remove {
self.dish.rules.remove(i);
}
if ui.button("add rule").clicked() { if ui.button("add rule").clicked() {
self.dish.rules.push(Rule::new()); self.dish.rules.push(Rule::new());
} }
@ -108,7 +116,7 @@ fn paint_chunk(painter: Painter, chunk: &Chunk, cells: &[CellData]) {
} }
const CSIZE: f32 = 24.; const CSIZE: f32 = 24.;
const OUTLINE: (f32, Color32) = (1., Color32::GRAY); const OUTLINE: (f32, Color32) = (3., Color32::GRAY);
fn rule_editor(ui: &mut Ui, rule: &mut Rule, cells: &[CellData]) { fn rule_editor(ui: &mut Ui, rule: &mut Rule, cells: &[CellData]) {
let cells_y = rule.from.height(); let cells_y = rule.from.height();
let cells_x = rule.from.width(); let cells_x = rule.from.width();