SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.
Move preview: draw the moved bodies' own triangles, without evaluating the move (#4912)
dudedagger42048c1ae8a8c8
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rsindex cd91d804d4..2978e76ec8 100644--- a/crates/ui-egui/src/lib.rs+++ b/crates/ui-egui/src/lib.rs@@ -156,6 +156,7 @@ mod file_picker;pub(crate) mod frame_watch;#[cfg(test)]mod history_off_thread_tests;+mod move_preview;pub use file_picker::FilePickerFuture;#[cfg(test)]mod blend_arrow_tests;diff --git a/crates/ui-egui/src/move_preview.rs b/crates/ui-egui/src/move_preview.rsnew file mode 100644index 0000000000..afbe61bb7c--- /dev/null+++ b/crates/ui-egui/src/move_preview.rs@@ -0,0 +1,203 @@+//! Move feedback from the moved bodies' own display triangles, without a scratch design. A move+//! changes no shape, so its preview needs no evaluation: the bodies' meshes are drawn moved by+//! the move's transform. The preview from a scratch design evaluated the move and meshed the+//! bodies again for every change, so while the triad was dragged the part trailed the arrow by+//! one evaluation, longer for a larger part.+use std::sync::Arc;++use serde_json::Value;+use solidcraft_engine::doc::{Document, Mat, apply_point, apply_vector, expr::Kind, rigid};+use solidcraft_engine::geom::{Aabb3, Mesh, Vec3};++use crate::{+ SolveApp,+ gpu::GpuScene,+ preview::{Built, Colors},+};++/// Most triangles moved this way each frame; beyond them the scratch-design preview runs.+const MAX_TRIANGLES: usize = 2_000_000;++#[derive(Default)]+pub(crate) struct MovePreview {+ cached: Option<Cached>,+}++/// The listed bodies' world meshes, for the design and revision they were taken from.+struct Cached {+ document: Arc<Document>,+ revision: u64,+ bodies: Vec<String>,+ meshes: Vec<Arc<Mesh>>,+}++impl MovePreview {+ pub(crate) fn clear(&mut self) {+ self.cached = None;+ }++ /// The preview of a `solid.move` (or its edit), or `None` to leave it to the scratch design:+ /// another command, values that don't evaluate, a body not shown, or too many triangles.+ pub(crate) fn compute(&mut self, app: &SolveApp, commands: &[(String, Value)], colors: Colors) -> Option<Result<Built, String>> {+ let [(id, params)] = commands else { return None };+ let params = match id.as_str() {+ "solid.move" => params,+ "timeline.redefine" if params.get("command").and_then(Value::as_str) == Some("solid.move") => params.get("params")?,+ _ => return None,+ };+ let doc = &app.session.doc;+ let length = |v: &Value| match v {+ Value::Number(n) => n.as_f64(),+ Value::String(e) => doc.eval(e, Kind::Length).ok(),+ _ => None,+ };+ let translate = match params.get("translate") {+ Some(Value::Array(a)) if a.len() == 3 => Vec3::new(length(&a[0])?, length(&a[1])?, length(&a[2])?),+ None => Vec3::ZERO,+ _ => return None,+ };+ let axis = match params.get("axis") {+ Some(Value::Array(a)) if a.len() == 3 => Vec3::new(a[0].as_f64()?, a[1].as_f64()?, a[2].as_f64()?),+ None => Vec3::Z,+ _ => return None,+ };+ let angle = match params.get("angle") {+ None | Some(Value::Null) => 0.0,+ Some(Value::String(e)) => doc.eval(e, Kind::Angle).ok()?,+ Some(Value::Number(n)) => doc.eval(&n.to_string(), Kind::Angle).ok()?,+ _ => return None,+ };+ if !(translate.is_finite() && axis.is_finite() && angle.is_finite()) || (angle != 0.0 && axis.normalized().is_none()) {+ return None;+ }+ let bodies: Vec<String> = params.get("bodies")?.as_array()?.iter().map(|b| b.as_str().map(str::to_string)).collect::<Option<_>>()?;+ if bodies.is_empty() {+ return None;+ }+ if self+ .cached+ .as_ref()+ .is_none_or(|c| c.revision != app.session.revision || !Arc::ptr_eq(&c.document, &app.session.doc) || c.bodies != bodies)+ {+ let state = app.session.world_state();+ let meshes: Vec<Arc<Mesh>> = bodies.iter().map(|n| state.body(n).map(|b| b.mesh())).collect::<Option<_>>()?;+ if meshes.iter().map(|m| m.triangles.len()).sum::<usize>() > MAX_TRIANGLES {+ return None;+ }+ self.cached = Some(Cached { document: app.session.doc.clone(), revision: app.session.revision, bodies: bodies.clone(), meshes });+ }+ let cache = self.cached.as_ref()?;+ // About the world origin, as the Move feature turns bodies (`kernel::transform`).+ let m = rigid(translate, Vec3::ZERO, axis, angle);+ let copy = params.get("copy").and_then(Value::as_bool) == Some(true);+ let mut scene = GpuScene::default();+ let mut bounds = Aabb3::EMPTY;+ for mesh in &cache.meshes {+ draw(&mut scene, mesh, &m, colors, &mut bounds);+ if !copy {+ // Where the body was, as the scratch-design preview shows a body moved away.+ for t in &mesh.triangles {+ for k in t {+ if let (Some(p), Some(n)) = (mesh.positions.get(*k as usize), mesh.normals.get(*k as usize)) {+ scene.ghost_tri(p.to_f32(), n.to_f32(), colors.removed);+ }+ }+ }+ }+ }+ Some(Ok(Built {+ scene,+ sketches: Vec::new(),+ applied: None,+ stopped: None,+ tapered: Vec::new(),+ replaced: if copy { Vec::new() } else { bodies },+ error: None,+ bounds,+ }))+ }+}++/// `mesh` moved by `m`, in the colour of geometry the feature adds, with its shaded edges.+fn draw(scene: &mut GpuScene, mesh: &Mesh, m: &Mat, colors: Colors, bounds: &mut Aabb3) {+ for t in &mesh.triangles {+ for k in t {+ let i = *k as usize;+ if let (Some(p), Some(n)) = (mesh.positions.get(i), mesh.normals.get(i)) {+ let p = apply_point(m, *p);+ bounds.add(p);+ scene.tri(p.to_f32(), apply_vector(m, *n).to_f32(), colors.added);+ }+ }+ }+ for (ei, e) in mesh.edges.iter().enumerate() {+ if !mesh.shaded_edge_visible(ei) {+ continue;+ }+ for w in e.windows(2) {+ scene.line(apply_point(m, w[0]).to_f32(), apply_point(m, w[1]).to_f32(), colors.edge, 1.3, false);+ }+ }+}++#[cfg(test)]+mod tests {+ use super::*;+ use crate::{Services, SolveApp};+ use serde_json::json;+ use solidcraft_engine::Session;++ fn app() -> SolveApp {+ let mut s = Session::default();+ s.execute("solid.box", &json!({"length": 20, "width": 10, "height": 5, "body_name": "Plate"})).unwrap();+ SolveApp::new(s, Services::default())+ }++ fn colors(app: &SolveApp) -> Colors {+ let _ = app;+ Colors::from_tokens(&crate::theme::Tokens::get())+ }++ fn near(a: Vec3, b: Vec3) -> bool {+ a.dist(b) < 1e-9+ }++ /// A move's preview is the body's own triangles moved as the Move feature moves the body:+ /// no scratch design, the original hidden (replaced), and where it lands is where the+ /// feature puts it.+ #[test]+ fn a_move_is_previewed_from_the_bodys_own_triangles() {+ let app = app();+ let c = colors(&app);+ let mut pv = MovePreview::default();+ let cmds =+ [("solid.move".to_string(), json!({"bodies": ["Plate"], "translate": ["30 mm", "0 mm", "0 mm"], "axis": [0, 0, 1], "angle": "90 deg"}))];+ let built = pv.compute(&app, &cmds, c).expect("taken here").expect("built");+ assert_eq!(built.replaced, vec!["Plate".to_string()]);+ // The Move feature on the same body: the preview's extent is the moved body's.+ let mut s = app.session.scratch();+ s.execute("solid.move", &cmds[0].1).unwrap();+ let moved = s.world_state().body("Plate").unwrap().mesh().bounds();+ assert!(near(built.bounds.min, moved.min) && near(built.bounds.max, moved.max), "{:?} vs {moved:?}", built.bounds);+ // A copy keeps the original shown.+ let copy = [("solid.move".to_string(), json!({"bodies": ["Plate"], "translate": [0, 0, 10], "copy": true}))];+ assert!(pv.compute(&app, ©, c).unwrap().unwrap().replaced.is_empty());+ }++ /// Anything it can't take is left to the scratch-design preview.+ #[test]+ fn what_it_cannot_take_goes_to_the_full_preview() {+ let app = app();+ let c = colors(&app);+ let mut pv = MovePreview::default();+ for p in [+ json!({"bodies": ["Nope"], "translate": [1, 0, 0]}),+ json!({"bodies": ["Plate"], "translate": ["width + ?", 0, 0]}),+ json!({"bodies": ["Plate"], "translate": [1, 0]}),+ json!({"bodies": [], "translate": [1, 0, 0]}),+ ] {+ assert!(pv.compute(&app, &[("solid.move".to_string(), p.clone())], c).is_none(), "{p}");+ }+ assert!(pv.compute(&app, &[("solid.extrude".to_string(), json!({}))], c).is_none());+ }+}diff --git a/crates/ui-egui/src/preview.rs b/crates/ui-egui/src/preview.rsindex 16e8510d24..637d2c4c67 100644--- a/crates/ui-egui/src/preview.rs+++ b/crates/ui-egui/src/preview.rs@@ -111,6 +111,7 @@ pub struct PreviewState {/// The radius splines the previewed fillet tapered its edges with.pub tapered: Vec<(Vec3, solidcraft_engine::kernel::Taper)>,straight: crate::extrude_preview::StraightPreview,+ moving: crate::move_preview::MovePreview,/// PreviewReselect: Primary held - hide the preview and restore replaced bodies for picks.pub rolled_back: bool,}@@ -133,6 +134,7 @@ impl PreviewState {fn clear(&mut self) {self.straight.clear();+ self.moving.clear();self.running = None;self.running_tool = false;self.running_stream_key = None;@@ -328,8 +330,13 @@ pub fn update(app: &mut SolveApp, ctx: &egui::Context) {pv.started = crate::now_ms();pv.running_stream_key = stream_key;let mut straight = std::mem::take(&mut app.preview.straight);- let job = straight.compute(app, &cmds, colors);+ let mut job = straight.compute(app, &cmds, colors);app.preview.straight = straight;+ if job.is_none() {+ let mut moving = std::mem::take(&mut app.preview.moving);+ job = moving.compute(app, &cmds, colors);+ app.preview.moving = moving;+ }if let Some(job) = job {app.preview.apply(key, job);app.preview.busy = false;