add names to groups

petri/src/lib.rs

@@ -10,7 +10,14 @@ pub struct Cell(pub u16);
 pub struct Dish {
 	pub chunk: Chunk,
 	pub rules: Vec<Rule>,
-	pub cell_groups: Vec<Vec<Option<Cell>>>,
+	pub cell_groups: Vec<CellGroup>,
+}
+
+#[derive(Debug, Default, Serialize, Deserialize)]
+pub struct CellGroup {
+	pub name: String,
+	pub void: bool,
+	pub cells: Vec<Cell>,
 }
 
 #[derive(Debug)]
@@ -26,12 +33,10 @@ pub struct Rule {
 	#[serde(skip)]
 	variants: Vec<SubRule>,
 	pub enabled: bool,
-	// probability: u8
-	#[serde(alias = "flip_h")]
 	pub flip_x: bool,
-	#[serde(alias = "flip_v")]
 	pub flip_y: bool,
 	pub rotate: bool,
+	// probability: u8
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -331,7 +336,11 @@ impl Dish {
 		Self {
 			chunk: Chunk::new().fill_random(),
 			rules: default_rules,
-			cell_groups: vec![vec![None, Some(Cell(1))]],
+			cell_groups: vec![CellGroup {
+				name: "empty".into(),
+				void: true,
+				cells: vec![Cell(0)],
+			}],
 		}
 	}
 
@@ -395,11 +404,9 @@ impl Dish {
 					}
 					RuleCellTo::GroupRandom(group_id) => {
 						let group = &self.cell_groups[group_id];
-						let i = random::<usize>() % group.len();
+						let i = random::<usize>() % group.cells.len();
-						let cell = group[i];
+						let cell = group.cells[i];
-						if let Some(cell) = cell {
+						self.set_cell(px, py, cell);
-							self.set_cell(px, py, cell);
-						}
 					}
 					RuleCellTo::Copy(x, y) => {
 						let cell = old_state[x + y * variant.width];
@@ -427,7 +434,12 @@ impl Dish {
 						}
 					}
 					RuleCellFrom::Group(group_id) => {
-						if !self.cell_groups[group_id].contains(&cell) {
+						let group = &self.cell_groups[group_id];
+						if let Some(cell) = cell {
+							if !group.cells.contains(&cell) {
+								return false;
+							}
+						} else if !group.void {
 							return false;
 						}
 					}

uscope/src/main.rs

@@ -15,7 +15,7 @@ use native_dialog::FileDialog;
 use rand::prelude::*;
 use serde::{Deserialize, Serialize};
 
-use petri::{Cell, Chunk, Dish, Rule, RuleCellFrom, RuleCellTo, CHUNK_SIZE};
+use petri::{Cell, CellGroup, Chunk, Dish, Rule, RuleCellFrom, RuleCellTo, CHUNK_SIZE};
 use serde_json::{json, Value};
 
 fn main() {
@@ -147,29 +147,25 @@ impl eframe::App for UScope {
 						let (rect, _response) =
 							ui.allocate_exact_size(Vec2::splat(CSIZE), Sense::click());
 						draw_group(ui, rect, group, &self.cell_types);
-						ui.menu_button("edit", |ui| {
+						ui.horizontal(|ui| {
-							let mut void = group.contains(&None);
+							ui.menu_button("edit", |ui| {
-							if ui.checkbox(&mut void, "void").changed() {
+								ui.checkbox(&mut group.void, "void");
-								if void {
+								for (i, celldata) in self.cell_types.iter().enumerate() {
-									group.push(None);
+									let mut included = group.cells.contains(&Cell(i as u16));
-								} else {
+									if ui.checkbox(&mut included, &celldata.name).changed() {
-									group.retain(|c| c.is_some());
+										if included {
-								}
+											group.cells.push(Cell(i as u16));
-							}
+										} else {
-							for (i, celldata) in self.cell_types.iter().enumerate() {
+											group.cells.retain(|c| c != &Cell(i as u16));
-								let mut included = group.contains(&Some(Cell(i as u16)));
+										}
-								if ui.checkbox(&mut included, &celldata.name).changed() {
-									if included {
-										group.push(Some(Cell(i as u16)));
-									} else {
-										group.retain(|c| c != &Some(Cell(i as u16)));
 									}
 								}
-							}
+							});
+							ui.text_edit_singleline(&mut group.name);
 						});
 					}
 					if ui.button("add group").clicked() {
-						self.dish.cell_groups.push(Vec::new());
+						self.dish.cell_groups.push(CellGroup::default());
 					}
 
 					ui.heading("Rules");
@@ -177,7 +173,6 @@ impl eframe::App for UScope {
 					let mut to_remove = None;
 					let mut to_clone = None;
 					for (i, rule) in self.dish.rules.iter_mut().enumerate() {
-						// ui.separator();
 						rule_editor(
 							ui,
 							rule,
@@ -252,7 +247,7 @@ fn rule_editor(
 	rule: &mut Rule,
 	index: usize,
 	cells: &[CellData],
-	groups: &[Vec<Option<Cell>>],
+	groups: &[CellGroup],
 	to_remove: &mut Option<usize>,
 	to_clone: &mut Option<usize>,
 ) {
@@ -408,7 +403,7 @@ fn rule_cell_edit_from(
 	x: usize,
 	y: usize,
 	cells: &[CellData],
-	groups: &[Vec<Option<Cell>>],
+	groups: &[CellGroup],
 ) -> bool {
 	let mut changed = false;
 	let rect = Rect::from_min_size(
@@ -471,7 +466,7 @@ fn rule_cell_edit_to(
 	rule: &mut RuleCellTo,
 	(x, y): (usize, usize),
 	cells: &[CellData],
-	groups: &[Vec<Option<Cell>>],
+	groups: &[CellGroup],
 	(rule_width, rule_height): (usize, usize),
 	overlay_lines: &mut Vec<(Pos2, Pos2)>,
 ) -> bool {
@@ -552,23 +547,21 @@ fn rule_cell_edit_to(
 	changed
 }
 
-fn draw_group(ui: &mut Ui, rect: Rect, group: &[Option<Cell>], cells: &[CellData]) {
+fn draw_group(ui: &mut Ui, rect: Rect, group: &CellGroup, cells: &[CellData]) {
-	let mut group_size = group.len();
+	let group_size = group.cells.len();
-	let has_void = group.contains(&None);
-	if has_void {
-		group_size -= 1;
-	}
 	let radius_per_color = (CSIZE * 0.7) / (group_size as f32);
-	for (i, cell) in group.iter().flatten().enumerate() {
+	for (i, cell) in group.cells.iter().enumerate() {
 		let color = cells[cell.id()].color;
 		let radius = radius_per_color * ((group_size - i) as f32);
 		ui.painter_at(rect)
 			.circle_filled(rect.center(), radius, color);
 	}
-	if has_void {
+	if group.void {
 		ui.painter_at(rect)
 			.line_segment([rect.min, rect.max], (1., Color32::WHITE));
 	}
+	ui.allocate_rect(rect, Sense::hover())
+		.on_hover_text(&group.name);
 }
 
 impl CellData {