mirror of
https://github.com/storytold/figcraft.git
synced 2026-10-24 18:36:44 -06:00
Large documents stay interactive: the canvas re-renders only what a pan uncovers or an edit touches, the layers panel lays out only the rows in view, and per-frame work no longer walks the whole page. - Benchmark: `cargo xtask bench [SIZES]` builds synthetic pages (`figcraft_engine::synthetic`: screens with an auto layout header, a card group, button instances and shapes/text) at 1k/10k/50k layers and prints engine/render timings (`figcraft-cli perf --layers 1000,10000`) and headless whole-UI frame timings (an ignored ui-egui test). - Retained canvas rendering (`figcraft_render::Retained`, used by the render worker): views snap to whole device pixels, so a pan shifts the previous image in place and renders only the uncovered strips; an edit renders only where changed layers were and are (`Document::changed_ids` diffs the two versions skipping shared structure; ancestors that paint from their children's pixels - booleans, effects, masks - count whole; background blur reach and noise are allowed for). Zoom, page, options, font or page-level changes, or large changes, render the whole view as before. `ui.inspect` reports `canvas.renderWork`. - The texture image is converted on the render thread, not the UI thread. - Layers panel: only visible rows are laid out (stable ids while scrolling); rows are cached per document version, page, expanded set and filter. - Frame labels and layout grids of off-screen top-level frames are skipped; the Prototype tab's connection sources are cached per document version. - Text: the layout cache keys by a cheap fingerprint confirmed by `TextData` equality (no Debug formatting per lookup, 32k entries) and hands out shared layouts; a layout generation marks renders stale when fonts arrive. Overflowing text is culled by its glyphs, so it no longer vanishes while its box is off screen. Before -> after (release, Windows, 1440x900 view, ms; 10k / 50k layers): - move one layer, re-render @100%: 7.65 / 6.49 -> 0.18 / 0.81 - move one layer, re-render zoomed out: 11.95 / 24.10 -> 0.16 / 0.77 - pan 40 px @100%: 7.53 / 6.82 -> 0.69 / 0.81 - pan 40 px zoomed out: 12.07 / 24.30 -> 1.62 / 4.17 - full render @100% / zoomed to fit: 7.78 / 44.22 -> 6.56 / 38.83 (10k @100%, 50k fit) - UI frame, every screen expanded in layers: 6.16 / 39.07 -> 0.24 / 0.57 - UI frame, scrolling that panel: 6.11 / 40.18 -> 0.43 / 0.40 - UI frame, layers filtered by name: 1.03 / 6.92 -> 0.17 / 0.36 - UI frame, Prototype tab: 0.89 / 6.45 -> 0.18 / 0.80 - UI frame, idle: 0.31 / 1.43 -> 0.11 / 0.39 Unchanged and within budget: single-layer edits through the engine ~0.01 ms, normalize after a one-node edit < 0.01 ms, hit test 26 / 93 us. Left: save/load at 50k (~0.7 s each), zoomed-out renders at 50k (~40 ms). Tests: retained renders match full renders after pans, moves, recolours, hide/remove/add, undo, masks, overflowing text, edits under a background blur and an inner-shadow/noise layer, a drop- shadowed group, and a blur panned in from the view's edge; zoom/page/options/page background render full; junk views don't panic. Layer-row and prototype-source caches follow edits, undo, page switches, expansion and the filter. `changed_ids`, the text cache, and the perf CLI. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
117 lines
4.1 KiB
Rust
117 lines
4.1 KiB
Rust
//! Minimal std-only argument parsing: positionals, `--key value` / `--key=value` / `-o value`
|
|
//! options, and boolean `--flag`s. Unknown options are usage errors.
|
|
|
|
use std::collections::BTreeMap;
|
|
|
|
use crate::{CliError, CliResult};
|
|
|
|
#[derive(Debug, Default)]
|
|
pub struct Args {
|
|
pub positional: Vec<String>,
|
|
values: BTreeMap<String, String>,
|
|
flags: Vec<String>,
|
|
}
|
|
|
|
impl Args {
|
|
pub fn parse(argv: &[String], valued: &[&str], flags: &[&str]) -> CliResult<Self> {
|
|
let mut a = Args::default();
|
|
let mut it = argv.iter();
|
|
while let Some(arg) = it.next() {
|
|
let name = if let Some(n) = arg.strip_prefix("--") {
|
|
n
|
|
} else if let Some(n) = arg.strip_prefix('-').filter(|n| n.len() == 1 && !n.starts_with(|c: char| c.is_ascii_digit())) {
|
|
n
|
|
} else {
|
|
a.positional.push(arg.clone());
|
|
continue;
|
|
};
|
|
let (name, inline) = match name.split_once('=') {
|
|
Some((n, v)) => (n, Some(v.to_string())),
|
|
None => (name, None),
|
|
};
|
|
if valued.contains(&name) {
|
|
let v = match inline {
|
|
Some(v) => v,
|
|
None => it.next().cloned().ok_or_else(|| CliError::Usage(format!("`{arg}` needs a value")))?,
|
|
};
|
|
a.values.insert(name.to_string(), v);
|
|
} else if flags.contains(&name) && inline.is_none() {
|
|
a.flags.push(name.to_string());
|
|
} else {
|
|
return Err(CliError::Usage(format!("unknown option `{arg}`")));
|
|
}
|
|
}
|
|
Ok(a)
|
|
}
|
|
|
|
pub fn value(&self, k: &str) -> Option<String> {
|
|
self.values.get(k).cloned()
|
|
}
|
|
|
|
pub fn flag(&self, k: &str) -> bool {
|
|
self.flags.iter().any(|f| f == k)
|
|
}
|
|
|
|
pub fn one_positional(&self, usage: &str) -> CliResult<String> {
|
|
match self.positional.as_slice() {
|
|
[one] => Ok(one.clone()),
|
|
_ => Err(CliError::Usage(format!("expected: {usage}"))),
|
|
}
|
|
}
|
|
|
|
pub fn scale(&self) -> CliResult<f64> {
|
|
match self.values.get("scale") {
|
|
None => Ok(1.0),
|
|
Some(s) => s
|
|
.trim_end_matches('x')
|
|
.parse::<f64>()
|
|
.ok()
|
|
.filter(|v| v.is_finite() && *v > 0.0 && *v <= 64.0)
|
|
.ok_or_else(|| CliError::Usage(format!("--scale must be a number in (0, 64], got `{s}`"))),
|
|
}
|
|
}
|
|
|
|
/// A comma-separated list of whole numbers (`--layers 1000,10_000`).
|
|
pub fn usizes(&self, k: &str, default: &[usize]) -> CliResult<Vec<usize>> {
|
|
match self.values.get(k) {
|
|
None => Ok(default.to_vec()),
|
|
Some(s) => s
|
|
.split(',')
|
|
.map(|v| v.trim().replace('_', "").parse::<usize>().map_err(|_| CliError::Usage(format!("--{k} must be whole numbers, got `{s}`"))))
|
|
.collect(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
fn v(s: &[&str]) -> Vec<String> {
|
|
s.iter().map(|x| x.to_string()).collect()
|
|
}
|
|
|
|
#[test]
|
|
fn parses_options_and_flags() {
|
|
let a = Args::parse(&v(&["in.figcraft", "-o", "out", "--scale=2", "--json"]), &["o", "scale"], &["json"]).unwrap();
|
|
assert_eq!(a.positional, ["in.figcraft"]);
|
|
assert_eq!(a.value("o").as_deref(), Some("out"));
|
|
assert_eq!(a.scale().unwrap(), 2.0);
|
|
assert!(a.flag("json"));
|
|
}
|
|
|
|
#[test]
|
|
fn rejects_bad_input() {
|
|
assert!(matches!(Args::parse(&v(&["--nope"]), &[], &[]), Err(CliError::Usage(_))));
|
|
assert!(matches!(Args::parse(&v(&["-o"]), &["o"], &[]), Err(CliError::Usage(_))));
|
|
assert!(matches!(Args::parse(&v(&["--json=1"]), &[], &["json"]), Err(CliError::Usage(_))));
|
|
let a = Args::parse(&v(&["--scale", "abc"]), &["scale"], &[]).unwrap();
|
|
assert!(a.scale().is_err());
|
|
let a = Args::parse(&v(&["--scale", "-3"]), &["scale"], &[]).unwrap();
|
|
assert!(a.scale().is_err());
|
|
// Negative numbers are positionals, not options.
|
|
let a = Args::parse(&v(&["-5"]), &[], &[]).unwrap();
|
|
assert_eq!(a.positional, ["-5"]);
|
|
}
|
|
}
|