From e51292e7fd15086c6fc4a61983eba4fa2e8bb882 Mon Sep 17 00:00:00 2001 From: Tanish Manku Date: Wed, 18 Nov 2026 03:56:47 -0700 Subject: [PATCH] feat(shell): screenshot states for Keep area and the Pen on a path; the Motion Editor explains a following axis (M1) --- src/app.rs | 36 ++++++++++++++++++++++++++++++++++++ src/motion_editor.rs | 5 ++++- src/pathtools.rs | 9 +++------ 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/src/app.rs b/src/app.rs index a33d0686..67a601ef 100644 --- a/src/app.rs +++ b/src/app.rs @@ -2997,6 +2997,42 @@ impl App { self.me_prop = anicraft_engine::doc::Property::Y; self.me_key = None; } + Some("keeparea") => { + // Keep area (ADR 0115): the Star layer's span as a motion tween that stretches + // the star to twice its width half way; its height isn't keyed and follows. + // The Motion Editor shows the derived Scale Y curve. + self.run("layer.select", json!({"index": 1})); + if let Some(target) = self.run("timeline.create_motion_tween", json!({"frame": 0})).and_then(|_| self.run("motion.info", json!({"frame": 0}))).and_then(|v| v["target"].as_u64()) { + self.run("timeline.set_keep_area", json!({"keep_area": true})); + self.run("timeline.goto", json!({"frame": 24})); + self.run("element.select", json!({"ids": [target]})); + self.run("element.set_transform", json!({"sx": 2.0})); + self.s.mark_saved(); + } + self.run("timeline.goto", json!({"frame": 12})); + self.frame_sel = Some(timeline::FrameSel::cell(self.s.layer, 12)); + self.show_panel(crate::dock::Panel::MotionEditor); + self.me_prop = anicraft_engine::doc::Property::ScaleY; + self.me_key = None; + } + Some("penpoints") => { + // The Pen on a selected open path (ADR 0115): its points show, and its end has + // been picked up to draw on from, with the last curve being drawn again (Alt), + // the segment as it was still in view. + self.tool = Tool::Pen; + self.s.style.object_drawing = true; + if let Some(id) = self.run("draw.path", json!({"d": "M120 260 C160 180 240 180 280 260 L360 260", "object": true, "fill": null})).and_then(|_| self.s.selection.ids().next()).map(|id| id.0) { + self.s.mark_saved(); + let v = |x: f32, y: f32| anicraft_engine::geom::Vec2::new(x, y); + let was = [v(440.0, 200.0), v(400.0, 190.0), v(480.0, 210.0)]; + self.pen = Some(pathtools::PenPath { + knots: vec![[v(360.0, 260.0); 3], [v(440.0, 200.0), v(430.0, 250.0), v(450.0, 150.0)]], + dragging: true, + grip: pathtools::PenGrip::Adjust { was }, + extends: Some((anicraft_engine::doc::ElementId(id), false)), + }); + } + } Some("pen") => { // A pen path still being drawn: a corner, a smooth point with handles, a corner. self.tool = Tool::Pen; diff --git a/src/motion_editor.rs b/src/motion_editor.rs index 2bbc624b..d202ef1b 100644 --- a/src/motion_editor.rs +++ b/src/motion_editor.rs @@ -482,7 +482,10 @@ pub fn show(app: &mut App, ui: &mut egui::Ui) { }; gp.text(pos2(graph.right() - 8.0, graph.top() + 24.0), Align2::RIGHT_TOP, note, font(Type::Caption), color(Type::Caption)); } - if track.is_none() { + if derived { + // No keys of its own, but it moves: say what moves it and how to take it over. + gp.text(pos2(graph.center().x, graph.top() + 44.0), Align2::CENTER_CENTER, tr!("{property} has no keyframes: Keep area moves it against the other scale axis. Click ◇ or drag its value to key it yourself.", property = label), font(Type::Caption), color(Type::Caption)); + } else if track.is_none() { gp.text(graph.center(), Align2::CENTER_CENTER, tr!("{property} has no keyframes: it stays {value}. Click ◇ or drag its value to key it here.", property = label, value = fmt(p, own(p))), font(Type::Caption), color(Type::Caption)); } // A colour's channel: the whole colour over the span, along the bottom of the graph, so diff --git a/src/pathtools.rs b/src/pathtools.rs index 320df28c..95e9c89f 100644 --- a/src/pathtools.rs +++ b/src/pathtools.rs @@ -426,12 +426,9 @@ pub fn pen_release(app: &mut App) { pub fn pen_input(app: &mut App, ui: &egui::Ui, resp: &egui::Response, xf: Xf) { let (pressed, down, m) = ui.input(|i| (i.pointer.primary_pressed(), i.pointer.primary_down(), i.modifiers)); let mods = PenMods { alt: m.alt, shift: m.shift, command: m.command }; - let Some(pos) = resp.interact_pointer_pos().or_else(|| resp.hover_pos()) else { - if !down { - pen_release(app); - } - return; - }; + // Off the stage there is nothing to do: a button let go out there is seen when the + // pointer comes back. + let Some(pos) = resp.interact_pointer_pos().or_else(|| resp.hover_pos()) else { return }; if pressed && resp.hovered() { pen_press(app, pos, xf, mods); } else if down {