editor stuff
This commit is contained in:
parent
365035a64d
commit
f71502f32a
2 changed files with 46 additions and 29 deletions
|
@ -180,6 +180,12 @@ impl RulePattern {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn set(&mut self, x: usize, y: usize, cell: Option<Cell>) {
|
||||||
|
if x < self.width && y < self.height {
|
||||||
|
self.contents[x + self.width * y] = cell
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn height(&self) -> usize {
|
pub fn height(&self) -> usize {
|
||||||
self.height
|
self.height
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
use eframe::{
|
use eframe::{
|
||||||
egui::{CentralPanel, Color32, Painter, Rect, Sense, SidePanel, Ui, Vec2},
|
egui::{CentralPanel, Color32, Painter, Pos2, Rect, Sense, SidePanel, Ui, Vec2},
|
||||||
NativeOptions,
|
NativeOptions,
|
||||||
};
|
};
|
||||||
use petri::{Chunk, Dish, Rule, CHUNK_SIZE};
|
use petri::{Cell, Chunk, Dish, Rule, RulePattern, CHUNK_SIZE};
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
eframe::run_native(
|
eframe::run_native(
|
||||||
|
@ -44,11 +44,15 @@ impl eframe::App for UScope {
|
||||||
self.dish.fire_blindly();
|
self.dish.fire_blindly();
|
||||||
}
|
}
|
||||||
SidePanel::left("left_panel").show(ctx, |ui| {
|
SidePanel::left("left_panel").show(ctx, |ui| {
|
||||||
ui.heading("Rules");
|
ui.heading("Cells");
|
||||||
ui.text_edit_singleline(&mut "dummy");
|
for cell in &mut self.celltypes {
|
||||||
if ui.button("aaa").clicked() {
|
ui.horizontal(|ui| {
|
||||||
dbg!(&self.dish.rules);
|
ui.set_width(100.);
|
||||||
|
ui.text_edit_singleline(&mut cell.name);
|
||||||
|
ui.color_edit_button_srgba(&mut cell.color);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
ui.heading("Rules");
|
||||||
for rule in &mut self.dish.rules {
|
for rule in &mut self.dish.rules {
|
||||||
rule_editor(ui, rule, &self.celltypes);
|
rule_editor(ui, rule, &self.celltypes);
|
||||||
}
|
}
|
||||||
|
@ -75,42 +79,49 @@ fn paint_chunk(painter: Painter, chunk: &Chunk, cells: &[CellData]) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const CSIZE: f32 = 24.;
|
||||||
|
const OUTLINE: (f32, Color32) = (1., 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 patt_height = rule.from.height();
|
let patt_height = rule.from.height();
|
||||||
let patt_width = rule.from.height();
|
let patt_width = rule.from.height();
|
||||||
|
|
||||||
const CSIZE: f32 = 24.;
|
|
||||||
const OUTLINE: (f32, Color32) = (1., Color32::GRAY);
|
|
||||||
|
|
||||||
let (_, bounds) = ui.allocate_space(Vec2::new(
|
let (_, bounds) = ui.allocate_space(Vec2::new(
|
||||||
CSIZE * (patt_width * 2 + 1) as f32,
|
CSIZE * (patt_width * 2 + 1) as f32,
|
||||||
CSIZE * patt_height as f32,
|
CSIZE * patt_height as f32,
|
||||||
));
|
));
|
||||||
for x in 0..patt_width {
|
for x in 0..patt_width {
|
||||||
for y in 0..patt_height {
|
for y in 0..patt_height {
|
||||||
let rect = Rect::from_min_size(
|
rule_cell_edit(ui, bounds.min, &mut rule.from, x, y, cells);
|
||||||
bounds.min + Vec2::from((x as f32, y as f32)) * CSIZE,
|
let offset = Vec2::X * (patt_width as f32 + 1.) * CSIZE;
|
||||||
Vec2::splat(CSIZE),
|
rule_cell_edit(ui, bounds.min + offset, &mut rule.to, x, y, cells);
|
||||||
);
|
}
|
||||||
if let Some(cell) = rule.from.get_mut(x, y) {
|
}
|
||||||
let color = cells[cell.id()].color;
|
}
|
||||||
ui.painter().rect(rect, 2., color, OUTLINE);
|
|
||||||
let a = ui.allocate_rect(rect, Sense::click());
|
|
||||||
if a.clicked() {
|
|
||||||
cell.0 = (cell.0 + 1) % cells.len() as u16;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(cell) = rule.to.get_mut(x, y) {
|
fn rule_cell_edit(
|
||||||
let rect = rect.translate(Vec2::X * (patt_width as f32 + 1.) * CSIZE);
|
ui: &mut Ui,
|
||||||
let color = cells[cell.id()].color;
|
origin: Pos2,
|
||||||
ui.painter().rect(rect, 2., color, OUTLINE);
|
rule: &mut RulePattern,
|
||||||
let a = ui.allocate_rect(rect, Sense::click());
|
x: usize,
|
||||||
if a.clicked() {
|
y: usize,
|
||||||
cell.0 = (cell.0 + 1) % cells.len() as u16;
|
cells: &[CellData],
|
||||||
}
|
) {
|
||||||
|
let rect = Rect::from_min_size(
|
||||||
|
origin + Vec2::from((x as f32, y as f32)) * CSIZE,
|
||||||
|
Vec2::splat(CSIZE),
|
||||||
|
);
|
||||||
|
let aabb = ui.allocate_rect(rect, Sense::click());
|
||||||
|
if let Some(cell) = rule.get_mut(x, y) {
|
||||||
|
let color = cells[cell.id()].color;
|
||||||
|
ui.painter().rect(rect, 2., color, OUTLINE);
|
||||||
|
if aabb.clicked() {
|
||||||
|
cell.0 += 1;
|
||||||
|
if cell.0 as usize == cells.len() {
|
||||||
|
rule.set(x, y, None);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if aabb.clicked() {
|
||||||
|
rule.set(x, y, Some(Cell(0)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue