Skip to content

VectorCraft: An open-source, vector art tool written by scratch in pure Rust

Mesh: Create Gradient Mesh at a point outside the object keeps the path

dotCooCoo76be75400e09
diff --git a/crates/engine/src/cmd/live/mesh.rs b/crates/engine/src/cmd/live/mesh.rs
index bdba2b037..e00c074bc 100644
--- a/crates/engine/src/cmd/live/mesh.rs
+++ b/crates/engine/src/cmd/live/mesh.rs
@@ -59,7 +59,14 @@ pub(super) fn mesh_create(s: &mut Session, p: &Value) -> Result<Value> {
};
let Some(mut m) = m else { continue };
if let Some(q) = at {
- index = m.add_lines_at(q, tol);
+ // A point the new mesh can't place its lines at leaves the object as it is.
+ match m.add_lines_at(q, tol) {
+ Some(i) => index = Some(i),
+ None => {
+ refused.get_or_insert("point is outside the object");
+ continue;
+ }
+ }
}
let mut mn = Node::new(n.id, NodeKind::Mesh(m));
mn.name = n.name.clone();
diff --git a/crates/engine/src/tests/live.rs b/crates/engine/src/tests/live.rs
index b46e5b0d0..06f250aad 100644
--- a/crates/engine/src/tests/live.rs
+++ b/crates/engine/src/tests/live.rs
@@ -1040,6 +1040,26 @@ fn mesh_create_at_point_single_undo() {
assert!(b.x0 > -3.0 && b.x1 < 103.0, "{b:?}");
}
+/// Create Gradient Mesh with an `at` the new mesh can't place its lines at (outside the object,
+/// or past `tolerance`) is an error that leaves the path a path; within `tolerance` it adds them.
+#[test]
+fn mesh_create_at_a_point_outside_keeps_the_path() {
+ let mut s = session();
+ let a = rect(&mut s, 0.0, 0.0, 100.0, 100.0);
+ sel(&mut s, &[a]);
+ let n = undo_len(&s);
+ for p in [json!({"at": [300, 300]}), json!({"at": [50, 103]}), json!({"at": [50, 110], "tolerance": 3})] {
+ let r = s.execute("object.mesh.create", &p);
+ assert!(matches!(&r, Err(EngineError::BadParams { msg, .. }) if msg == "point is outside the object"), "{p}: {r:?}");
+ assert!(matches!(node(&s, a).kind, NodeKind::Path { .. }), "{p}: still a path");
+ }
+ assert_eq!(undo_len(&s), n, "nothing changed");
+ let r = s.execute("object.mesh.create", &json!({"at": [50, 102], "tolerance": 3})).unwrap();
+ let m = mesh_of(&s, a);
+ assert_eq!((m.rows, m.cols), (1, 2), "a column through the bottom edge");
+ assert!(m.points[r["index"].as_u64().unwrap() as usize].p.distance(Point::new(50.0, 100.0)) < 0.5);
+}
+
#[test]
fn mesh_expand_to_flat_pieces() {
let mut s = session();