Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01AS5Tn3xieewUSg3uxrMVdL
719 lines
34 KiB
Rust
719 lines
34 KiB
Rust
//! Solid feature commands: extrude, revolve, fillet, chamfer, primitives, combine, move.
|
|
|
|
use serde_json::{Value, json};
|
|
use solvecraft_doc::{AxisRef, Direction, Extent, FeatureKind, Operation, ProfileSel, expr::Kind};
|
|
use solvecraft_geom::Vec3;
|
|
|
|
use super::CommandSpec;
|
|
use crate::params::{bad, bool_, expr, req_expr, str_, string_list, vec2, vec3};
|
|
use crate::{EngineError, Result, Session};
|
|
|
|
pub static COMMANDS: &[CommandSpec] = &[
|
|
CommandSpec::new("Extrude", "Extrude", extrude)
|
|
.at("SOLID", "CREATE")
|
|
.icon("extrude")
|
|
.key("E")
|
|
.params("distance: expr (or through_all: true); taper?: angle expr; sketch?: id|name (default: active or last sketch); profiles?: all | [index] | [[curve ids]] | [{point:[x,y]}]; face?: [x,y,z] (extrude a planar body face instead of a sketch profile); direction?: positive|negative|symmetric; distance2?; start_offset?; operation?: new|join|cut|intersect|auto (cut into a body, join out of one, else new); targets?: [body]; name?; body_name?"),
|
|
CommandSpec::new("Revolve", "Revolve", revolve)
|
|
.at("SOLID", "CREATE")
|
|
.icon("revolve")
|
|
.params("axis: sketch line id | x | y (sketch axes) | X|Y|Z (world); angle?: expr (default 360 deg); sketch?, profiles?, operation?, targets?, name?, body_name?"),
|
|
CommandSpec::new("Sweep", "Sweep", sweep)
|
|
.at("SOLID", "CREATE")
|
|
.icon("sweep")
|
|
.params("sketch: profile sketch; profiles?; path_sketch: sketch; path: [curve ids in order]; operation?"),
|
|
CommandSpec::new("SolidLoft", "Loft", loft).at("SOLID", "CREATE").icon("loft").params("sections: [{sketch, profiles?}] (2 or more, in order); operation?"),
|
|
CommandSpec::new("PrimitiveBox", "Box", prim_box).at("SOLID", "CREATE").icon("box").params("length, width, height: expr; corner?: [x,y,z] | center?: [x,y,z]; operation?"),
|
|
CommandSpec::new("PrimitiveCylinder", "Cylinder", prim_cylinder).at("SOLID", "CREATE").icon("cylinder").params("radius | diameter, height: expr; base?: [x,y,z]; axis?: [x,y,z]; operation?"),
|
|
CommandSpec::new("PrimitiveSphere", "Sphere", prim_sphere).at("SOLID", "CREATE").icon("sphere").params("radius | diameter: expr; center?: [x,y,z]; operation?"),
|
|
CommandSpec::new("PrimitiveTorus", "Torus", prim_torus).at("SOLID", "CREATE").icon("torus").params("major, minor: expr (radii); center?; operation?"),
|
|
CommandSpec::new("FusionFilletEdgesCommand", "Fillet", fillet)
|
|
.at("SOLID", "MODIFY")
|
|
.icon("fillet")
|
|
.key("F")
|
|
.params("edges: [[x,y,z] point on edge | {body, index}]; radius: expr; body?"),
|
|
CommandSpec::new("FusionChamferCommand", "Chamfer", chamfer).at("SOLID", "MODIFY").icon("chamfer").params("edges: [[x,y,z] | {body, index}]; distance: expr; body?"),
|
|
CommandSpec::new("FusionCombineCommand", "Combine", combine).at("SOLID", "MODIFY").icon("combine").params("target: body; tools: [body]; operation?: join|cut|intersect; keep_tools?: bool"),
|
|
CommandSpec::new("PatternRectangular", "Rectangular Pattern", pattern_rect)
|
|
.at("SOLID", "CREATE")
|
|
.icon("pattern_rect")
|
|
.params("features: [names]; dir1: [x,y,z]; count1; spacing1; dir2?, count2?, spacing2?"),
|
|
CommandSpec::new("PatternCircular", "Circular Pattern", pattern_circ)
|
|
.at("SOLID", "CREATE")
|
|
.icon("pattern_circ")
|
|
.params("features: [names]; axis: X|Y|Z | {origin, dir}; count; angle? (default 360 deg)"),
|
|
CommandSpec::new("MirrorCommand", "Mirror", mirror).at("SOLID", "CREATE").icon("mirror").params("features: [names]; plane: XY|XZ|YZ | {origin, x_dir, y_dir}"),
|
|
CommandSpec::new("FusionHoleCommand", "Hole", hole)
|
|
.at("SOLID", "CREATE")
|
|
.icon("hole")
|
|
.key("H")
|
|
.params("position: [x,y,z] on a face; direction?: [x,y,z] (default: into the face); diameter; depth? (default through all); type?: simple|drilled|counterbore|countersink; tip_angle?; cb_diameter?, cb_depth?; cs_diameter?, cs_angle?"),
|
|
CommandSpec::new("FusionShellBodyCommand", "Shell", shell)
|
|
.at("SOLID", "MODIFY")
|
|
.icon("shell")
|
|
.params("faces: [[x,y,z] points on the faces to remove]; thickness: expr (inside); body?"),
|
|
CommandSpec::new("FusionDraftCommand", "Draft", draft)
|
|
.at("SOLID", "MODIFY")
|
|
.icon("draft")
|
|
.params("faces: [[x,y,z]]; angle: expr; neutral: XY|XZ|YZ|plane name|{origin, normal}; pull?: [x,y,z] (default: neutral plane normal); body?"),
|
|
CommandSpec::new("ConstructionPlaneOffsetFromPlaneCommand", "Offset Plane", plane_offset)
|
|
.at("SOLID", "CONSTRUCT")
|
|
.icon("plane")
|
|
.params("base: XY|XZ|YZ|plane name; offset: expr; name?"),
|
|
CommandSpec::new("ConstructionPlaneAtAngleCommand", "Plane at Angle", plane_angle)
|
|
.at("SOLID", "CONSTRUCT")
|
|
.icon("plane")
|
|
.params("base: XY|XZ|YZ|plane name; axis: X|Y|Z|{origin, dir}; angle: expr; name?"),
|
|
CommandSpec::new("FusionSplitBodyCommand", "Split Body", split_body).at("SOLID", "MODIFY").icon("split").params("body: name; plane: XY|XZ|YZ|plane name|{origin, normal}"),
|
|
CommandSpec::new("FusionPressPullCommand", "Press Pull", press_pull)
|
|
.at("SOLID", "MODIFY")
|
|
.icon("presspull")
|
|
.key("Q")
|
|
.params("face: [x,y,z] and distance: expr (positive adds material, negative cuts), or edges: [[x,y,z]…] and distance (a fillet)"),
|
|
CommandSpec::new("FusionMoveCommand", "Move/Copy", move_bodies).at("SOLID", "MODIFY").icon("move").key("M").params("bodies: [names]; translate?: [x,y,z] (exprs or numbers); axis?: [x,y,z]; angle?: expr"),
|
|
];
|
|
|
|
/// Where an extrude starts and which way is positive: a point inside the (first) profile or
|
|
/// face, and the unit normal.
|
|
fn extrude_base(s: &Session, p: &Value) -> Option<(Vec3, Vec3)> {
|
|
if let Some(fp) = p.get("face").and_then(vec3) {
|
|
return Some((fp, super::face::face_normal(s, fp)?));
|
|
}
|
|
let sid = feature_sketch(s, p, "Extrude").ok()?;
|
|
let st = s.model.state();
|
|
let ss = st.sketch(sid)?;
|
|
let ps = &ss.profiles;
|
|
let q = match profiles(p, "Extrude").ok()? {
|
|
ProfileSel::All => ps.first()?.region.interior_point(),
|
|
ProfileSel::Indices { indices } => ps.get(*indices.first()?)?.region.interior_point(),
|
|
ProfileSel::Points { points } => *points.first()?,
|
|
ProfileSel::Curves { loops } => {
|
|
let mut want: Vec<&String> = loops.first()?.iter().collect();
|
|
want.sort();
|
|
ps.iter()
|
|
.find(|x| {
|
|
let mut have: Vec<&String> = x.outer_curves.iter().collect();
|
|
have.sort();
|
|
have == want
|
|
})?
|
|
.region
|
|
.interior_point()
|
|
}
|
|
};
|
|
Some((ss.plane.to_world(q), ss.plane.normal()))
|
|
}
|
|
|
|
/// What `operation: "auto"` means for an extrude with these parameters: `cut` when it goes
|
|
/// into a body, `join` when it grows out of one, `new` otherwise.
|
|
pub fn auto_operation(s: &Session, p: &Value) -> Option<&'static str> {
|
|
let d = s.doc.eval(&expr(p, "distance")?, Kind::Length).ok()?;
|
|
let dir = str_(p, "direction").map(str::to_ascii_lowercase);
|
|
let symmetric = dir.as_deref() == Some("symmetric");
|
|
let d = if matches!(dir.as_deref(), Some("negative" | "reverse" | "flip")) { -d } else { d };
|
|
let (base, n) = extrude_base(s, p)?;
|
|
let st = s.model.state();
|
|
if st.bodies.is_empty() || !d.is_finite() {
|
|
return Some("new");
|
|
}
|
|
let inside = |q: Vec3| st.bodies.iter().any(|b| b.mesh().contains(q));
|
|
let eps = (d.abs() * 1e-3).max(1e-3);
|
|
let sign = if d < 0.0 { -1.0 } else { 1.0 };
|
|
if symmetric {
|
|
return Some(if inside(base + n * (d.abs() * 0.5)) || inside(base - n * (d.abs() * 0.5)) { "cut" } else { "new" });
|
|
}
|
|
if inside(base + n * (d * 0.5)) {
|
|
Some("cut")
|
|
} else if inside(base - n * (eps * sign)) {
|
|
Some("join")
|
|
} else {
|
|
Some("new")
|
|
}
|
|
}
|
|
|
|
fn operation(p: &Value, cmd: &str) -> Result<Operation> {
|
|
match str_(p, "operation") {
|
|
None => Ok(Operation::NewBody),
|
|
Some(o) => Operation::parse(o).ok_or_else(|| bad(cmd, format!("unknown operation `{o}` (new, join, cut, intersect)"))),
|
|
}
|
|
}
|
|
|
|
/// The sketch a feature uses: `sketch` param, the active sketch, or the last sketch.
|
|
fn feature_sketch(s: &Session, p: &Value, cmd: &str) -> Result<u64> {
|
|
if let Some(v) = p.get("sketch") {
|
|
let key = match v {
|
|
Value::Number(n) => n.to_string(),
|
|
Value::String(x) => x.clone(),
|
|
_ => return Err(bad(cmd, "`sketch` must be an id or name")),
|
|
};
|
|
let f = s.doc.find_feature(&key).ok_or_else(|| bad(cmd, format!("no sketch `{key}`")))?;
|
|
return match f.kind {
|
|
FeatureKind::Sketch { .. } => Ok(f.id),
|
|
_ => Err(bad(cmd, format!("`{key}` is not a sketch"))),
|
|
};
|
|
}
|
|
if let Some(a) = s.active_sketch {
|
|
return Ok(a);
|
|
}
|
|
let limit = s.doc.marker.unwrap_or(usize::MAX);
|
|
s.doc
|
|
.features
|
|
.iter()
|
|
.take(limit)
|
|
.rev()
|
|
.find(|f| matches!(f.kind, FeatureKind::Sketch { .. }))
|
|
.map(|f| f.id)
|
|
.ok_or_else(|| bad(cmd, "there is no sketch to use (create one first)"))
|
|
}
|
|
|
|
fn profiles(p: &Value, cmd: &str) -> Result<ProfileSel> {
|
|
let Some(v) = p.get("profiles") else { return Ok(ProfileSel::All) };
|
|
match v {
|
|
Value::String(s) if s.eq_ignore_ascii_case("all") => Ok(ProfileSel::All),
|
|
Value::Number(n) => Ok(ProfileSel::Indices { indices: vec![n.as_u64().ok_or_else(|| bad(cmd, "profile index"))? as usize] }),
|
|
Value::Array(a) if a.is_empty() => Err(bad(cmd, "`profiles` is empty")),
|
|
Value::Array(a) if a.len() > 10_000 => Err(bad(cmd, "too many profiles")),
|
|
Value::Array(a) => {
|
|
if a.iter().all(Value::is_u64) {
|
|
return Ok(ProfileSel::Indices { indices: a.iter().filter_map(Value::as_u64).map(|x| x as usize).collect() });
|
|
}
|
|
if a.iter().all(|x| x.get("point").is_some()) {
|
|
let pts =
|
|
a.iter().map(|x| x.get("point").and_then(vec2).ok_or_else(|| bad(cmd, "profile point must be [x, y]"))).collect::<Result<_>>()?;
|
|
return Ok(ProfileSel::Points { points: pts });
|
|
}
|
|
// [[ids]], [{curves: [...]}] or recipe-style [{loops: [{outer: true, curves: [...]}]}].
|
|
let mut loops = Vec::new();
|
|
for x in a {
|
|
let ids: Vec<String> = match x {
|
|
Value::Array(ids) => ids.iter().filter_map(|i| i.as_str().map(str::to_string)).collect(),
|
|
Value::Object(o) => {
|
|
if let Some(c) = o.get("curves") {
|
|
string_list(&json!({"c": c}), "c")
|
|
} else if let Some(ls) = o.get("loops").and_then(Value::as_array) {
|
|
let outer = ls.iter().find(|l| l.get("outer").and_then(Value::as_bool).unwrap_or(true)).or(ls.first());
|
|
outer.map(|l| string_list(l, "curves")).unwrap_or_default()
|
|
} else {
|
|
Vec::new()
|
|
}
|
|
}
|
|
_ => Vec::new(),
|
|
};
|
|
if ids.is_empty() {
|
|
return Err(bad(cmd, "each profile must be an index, a list of curve ids, {curves}, {loops} or {point}"));
|
|
}
|
|
loops.push(ids);
|
|
}
|
|
Ok(ProfileSel::Curves { loops })
|
|
}
|
|
_ => Err(bad(cmd, "`profiles` must be \"all\" or a list")),
|
|
}
|
|
}
|
|
|
|
fn check_expr(s: &Session, e: &str, kind: Kind, cmd: &str, what: &str) -> Result<()> {
|
|
s.doc.eval(e, kind).map(|_| ()).map_err(|err| bad(cmd, format!("{what}: {err}")))
|
|
}
|
|
|
|
/// Add a feature, evaluate, and report its result (an evaluation error fails the command).
|
|
fn add_feature(s: &mut Session, p: &Value, kind: FeatureKind) -> Result<Value> {
|
|
let name = str_(p, "name");
|
|
let id = s.doc_mut().add_feature(kind, name)?;
|
|
let mut names = string_list(p, "body_names");
|
|
if let Some(b) = str_(p, "body_name") {
|
|
names.insert(0, b.to_string());
|
|
}
|
|
if !names.is_empty()
|
|
&& let Some(f) = s.doc_mut().feature_mut(id)
|
|
{
|
|
f.body_names = names;
|
|
}
|
|
s.active_sketch = None;
|
|
s.refresh();
|
|
let r = s.model.result(id).cloned();
|
|
if let Some(e) = r.as_ref().and_then(|r| r.error.clone()) {
|
|
return Err(EngineError::Other(e));
|
|
}
|
|
let st = s.model.state();
|
|
let bodies: Vec<&str> = st.bodies.iter().map(|b| b.name.as_str()).collect();
|
|
let fname = s.doc.feature(id).map(|f| f.name.clone()).unwrap_or_default();
|
|
Ok(json!({"feature": id, "name": fname, "bodies": bodies, "ms": r.map(|r| r.ms)}))
|
|
}
|
|
|
|
fn extrude(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "Extrude";
|
|
// A planar body face extrudes like a profile: its boundary is copied into a sketch on it.
|
|
let (sketch, face_profile) = match p.get("face").and_then(vec3) {
|
|
Some(fp) => {
|
|
let (id, inside) = super::face::sketch_of_face(s, fp, cmd)?;
|
|
(id, Some(ProfileSel::Points { points: vec![inside] }))
|
|
}
|
|
None => (feature_sketch(s, p, cmd)?, None),
|
|
};
|
|
let through_all = bool_(p, "through_all").unwrap_or(false) || str_(p, "extent").is_some_and(|e| e.eq_ignore_ascii_case("through_all"));
|
|
let distance = if through_all { expr(p, "distance").unwrap_or_else(|| "0".into()) } else { req_expr(cmd, p, "distance")? };
|
|
check_expr(s, &distance, Kind::Length, cmd, "distance")?;
|
|
let taper = expr(p, "taper");
|
|
if let Some(t) = &taper {
|
|
check_expr(s, t, Kind::Angle, cmd, "taper")?;
|
|
}
|
|
let direction = match str_(p, "direction").map(str::to_ascii_lowercase).as_deref() {
|
|
None | Some("positive") | Some("one_side") => Direction::Positive,
|
|
Some("negative") | Some("reverse") | Some("flip") => Direction::Negative,
|
|
Some("symmetric") => Direction::Symmetric,
|
|
Some(o) => return Err(bad(cmd, format!("unknown direction `{o}`"))),
|
|
};
|
|
let distance2 = expr(p, "distance2");
|
|
if let Some(d) = &distance2 {
|
|
check_expr(s, d, Kind::Length, cmd, "distance2")?;
|
|
}
|
|
let start_offset = expr(p, "start_offset");
|
|
if let Some(d) = &start_offset {
|
|
check_expr(s, d, Kind::Length, cmd, "start_offset")?;
|
|
}
|
|
let kind = FeatureKind::Extrude {
|
|
sketch,
|
|
profiles: match face_profile {
|
|
Some(f) => f,
|
|
None => profiles(p, cmd)?,
|
|
},
|
|
extent: Extent { distance, direction, distance2, start_offset, through_all, taper },
|
|
operation: match str_(p, "operation") {
|
|
Some(o) if o.eq_ignore_ascii_case("auto") => Operation::parse(auto_operation(s, p).unwrap_or("new")).unwrap_or(Operation::NewBody),
|
|
_ => operation(p, cmd)?,
|
|
},
|
|
targets: string_list(p, "targets"),
|
|
};
|
|
add_feature(s, p, kind)
|
|
}
|
|
|
|
fn revolve(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "Revolve";
|
|
let sketch = feature_sketch(s, p, cmd)?;
|
|
let axis = if let Some(o) = p.get("axis").filter(|v| v.is_object()) {
|
|
let origin = o.get("origin").and_then(vec3).unwrap_or(Vec3::ZERO);
|
|
let dir = o.get("dir").and_then(vec3).ok_or_else(|| bad(cmd, "axis needs `dir`"))?;
|
|
AxisRef::Line { origin, dir }
|
|
} else {
|
|
match str_(p, "axis") {
|
|
Some(a @ ("X" | "Y" | "Z")) => AxisRef::World { axis: a.into() },
|
|
Some(a @ ("x" | "y")) => AxisRef::SketchAxis { axis: a.into() },
|
|
Some(id) => AxisRef::SketchLine { curve: id.into() },
|
|
None => return Err(bad(cmd, "`axis` must be a sketch line id, x, y (sketch axes), X, Y, Z or {origin, dir}")),
|
|
}
|
|
};
|
|
let angle = expr(p, "angle").unwrap_or_else(|| "360 deg".into());
|
|
check_expr(s, &angle, Kind::Angle, cmd, "angle")?;
|
|
let kind =
|
|
FeatureKind::Revolve { sketch, profiles: profiles(p, cmd)?, axis, angle, operation: operation(p, cmd)?, targets: string_list(p, "targets") };
|
|
add_feature(s, p, kind)
|
|
}
|
|
|
|
fn radius_expr(p: &Value, cmd: &str) -> Result<String> {
|
|
match (expr(p, "radius"), expr(p, "diameter")) {
|
|
(Some(r), _) => Ok(r),
|
|
(None, Some(d)) => Ok(format!("({d}) / 2")),
|
|
_ => Err(bad(cmd, "needs `radius` or `diameter`")),
|
|
}
|
|
}
|
|
|
|
fn prim_box(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "PrimitiveBox";
|
|
let (l, w, h) = (req_expr(cmd, p, "length")?, req_expr(cmd, p, "width")?, req_expr(cmd, p, "height")?);
|
|
for (e, n) in [(&l, "length"), (&w, "width"), (&h, "height")] {
|
|
check_expr(s, e, Kind::Length, cmd, n)?;
|
|
}
|
|
let corner = match (p.get("corner").and_then(vec3), p.get("center").and_then(vec3)) {
|
|
(Some(c), _) => c,
|
|
(None, Some(c)) => {
|
|
let v = |e: &str| s.doc.eval(e, Kind::Length).unwrap_or(0.0);
|
|
c - Vec3::new(v(&l), v(&w), v(&h)) * 0.5
|
|
}
|
|
_ => Vec3::ZERO,
|
|
};
|
|
add_feature(s, p, FeatureKind::Box { corner, length: l, width: w, height: h, operation: operation(p, cmd)? })
|
|
}
|
|
|
|
fn prim_cylinder(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "PrimitiveCylinder";
|
|
let radius = radius_expr(p, cmd)?;
|
|
let height = req_expr(cmd, p, "height")?;
|
|
check_expr(s, &radius, Kind::Length, cmd, "radius")?;
|
|
check_expr(s, &height, Kind::Length, cmd, "height")?;
|
|
let base = p.get("base").and_then(vec3).unwrap_or(Vec3::ZERO);
|
|
let axis = p.get("axis").and_then(vec3).unwrap_or(Vec3::Z);
|
|
add_feature(s, p, FeatureKind::Cylinder { base, axis, radius, height, operation: operation(p, cmd)? })
|
|
}
|
|
|
|
fn prim_sphere(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "PrimitiveSphere";
|
|
let radius = radius_expr(p, cmd)?;
|
|
check_expr(s, &radius, Kind::Length, cmd, "radius")?;
|
|
let center = p.get("center").and_then(vec3).unwrap_or(Vec3::ZERO);
|
|
add_feature(s, p, FeatureKind::Sphere { center, radius, operation: operation(p, cmd)? })
|
|
}
|
|
|
|
fn prim_torus(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "PrimitiveTorus";
|
|
let (major, minor) = (req_expr(cmd, p, "major")?, req_expr(cmd, p, "minor")?);
|
|
check_expr(s, &major, Kind::Length, cmd, "major")?;
|
|
check_expr(s, &minor, Kind::Length, cmd, "minor")?;
|
|
let center = p.get("center").and_then(vec3).unwrap_or(Vec3::ZERO);
|
|
add_feature(s, p, FeatureKind::Torus { center, major, minor, operation: operation(p, cmd)? })
|
|
}
|
|
|
|
/// Edge references → points on the edges.
|
|
fn edge_points(s: &Session, p: &Value, cmd: &str) -> Result<Vec<Vec3>> {
|
|
let a = p.get("edges").and_then(Value::as_array).ok_or_else(|| bad(cmd, "`edges` must be a list"))?;
|
|
if a.is_empty() || a.len() > 1000 {
|
|
return Err(bad(cmd, "select 1…1000 edges"));
|
|
}
|
|
let st = s.model.state();
|
|
let mut out = Vec::new();
|
|
for e in a {
|
|
if let Some(pt) = vec3(e).or_else(|| e.get("point").and_then(vec3)) {
|
|
out.push(pt);
|
|
continue;
|
|
}
|
|
let body = e.get("body").and_then(Value::as_str).ok_or_else(|| bad(cmd, "an edge is a point [x,y,z], {point} or {body, index}"))?;
|
|
let idx = e.get("index").and_then(Value::as_u64).ok_or_else(|| bad(cmd, "edge `index` must be a number"))? as usize;
|
|
let b = st.body(body).ok_or_else(|| bad(cmd, format!("no body `{body}`")))?;
|
|
let tol = (b.body.size() * 2e-3).max(1e-3);
|
|
let edges = b.body.edges(tol)?;
|
|
out.push(edges.get(idx).ok_or_else(|| bad(cmd, format!("{body} has no edge {idx}")))?.mid);
|
|
}
|
|
Ok(out)
|
|
}
|
|
|
|
/// Press Pull: a face moves along its normal (an extrude that joins outward or cuts inward); an
|
|
/// edge is rounded (a fillet).
|
|
fn press_pull(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "FusionPressPullCommand";
|
|
let distance = req_expr(cmd, p, "distance")?;
|
|
if p.get("edges").is_some() {
|
|
return fillet(s, &json!({"edges": p.get("edges"), "radius": distance}));
|
|
}
|
|
let face = p.get("face").ok_or_else(|| bad(cmd, "needs `face` or `edges`"))?;
|
|
let d = s.doc.eval(&distance, Kind::Length).map_err(|e| bad(cmd, format!("distance: {e}")))?;
|
|
if d.abs() < 1e-9 {
|
|
return Err(bad(cmd, "the distance must not be zero"));
|
|
}
|
|
let (dist, dir, op) = if d > 0.0 { (distance, "positive", "join") } else { (format!("-({distance})"), "negative", "cut") };
|
|
extrude(s, &json!({"face": face, "distance": dist, "direction": dir, "operation": op}))
|
|
}
|
|
|
|
fn fillet(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "FusionFilletEdgesCommand";
|
|
let edges = edge_points(s, p, cmd)?;
|
|
let radius = req_expr(cmd, p, "radius")?;
|
|
check_expr(s, &radius, Kind::Length, cmd, "radius")?;
|
|
add_feature(s, p, FeatureKind::Fillet { edges, radius, body: str_(p, "body").map(str::to_string) })
|
|
}
|
|
|
|
fn chamfer(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "FusionChamferCommand";
|
|
let edges = edge_points(s, p, cmd)?;
|
|
let distance = req_expr(cmd, p, "distance")?;
|
|
check_expr(s, &distance, Kind::Length, cmd, "distance")?;
|
|
add_feature(s, p, FeatureKind::Chamfer { edges, distance, body: str_(p, "body").map(str::to_string) })
|
|
}
|
|
|
|
fn combine(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "FusionCombineCommand";
|
|
let target = str_(p, "target").ok_or_else(|| bad(cmd, "`target` must be a body name"))?.to_string();
|
|
let tools = string_list(p, "tools");
|
|
if tools.is_empty() {
|
|
return Err(bad(cmd, "`tools` must list bodies"));
|
|
}
|
|
let op = match str_(p, "operation") {
|
|
None => Operation::Join,
|
|
Some(o) => Operation::parse(o).filter(|o| *o != Operation::NewBody).ok_or_else(|| bad(cmd, "operation must be join, cut or intersect"))?,
|
|
};
|
|
add_feature(s, p, FeatureKind::Combine { target, tools, operation: op, keep_tools: bool_(p, "keep_tools").unwrap_or(false) })
|
|
}
|
|
|
|
fn move_bodies(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "FusionMoveCommand";
|
|
let bodies = string_list(p, "bodies");
|
|
if bodies.is_empty() {
|
|
return Err(bad(cmd, "`bodies` must list bodies"));
|
|
}
|
|
let t = match p.get("translate") {
|
|
Some(Value::Array(a)) if a.len() == 3 => {
|
|
let mut out: [String; 3] = Default::default();
|
|
for (i, v) in a.iter().enumerate() {
|
|
let e = expr(&json!({"v": v}), "v").ok_or_else(|| bad(cmd, "translate entries must be numbers or expressions"))?;
|
|
check_expr(s, &e, Kind::Length, cmd, "translate")?;
|
|
if let Some(slot) = out.get_mut(i) {
|
|
*slot = e;
|
|
}
|
|
}
|
|
out
|
|
}
|
|
None => ["0".into(), "0".into(), "0".into()],
|
|
_ => return Err(bad(cmd, "`translate` must be [x, y, z]")),
|
|
};
|
|
let angle = expr(p, "angle");
|
|
if let Some(a) = &angle {
|
|
check_expr(s, a, Kind::Angle, cmd, "angle")?;
|
|
}
|
|
add_feature(s, p, FeatureKind::Move { bodies, translate: t, rotate_axis: p.get("axis").and_then(vec3), angle })
|
|
}
|
|
|
|
fn source_features(s: &Session, p: &Value, cmd: &str) -> Result<Vec<String>> {
|
|
let names = string_list(p, "features");
|
|
if names.is_empty() {
|
|
return Err(bad(cmd, "`features` must list features to copy"));
|
|
}
|
|
for n in &names {
|
|
if s.doc.find_feature(n).is_none() {
|
|
return Err(bad(cmd, format!("no feature `{n}`")));
|
|
}
|
|
}
|
|
Ok(names)
|
|
}
|
|
|
|
fn axis_line(p: &Value, cmd: &str) -> Result<(Vec3, Vec3)> {
|
|
match p.get("axis") {
|
|
Some(Value::String(a)) => match a.to_ascii_uppercase().as_str() {
|
|
"X" => Ok((Vec3::ZERO, Vec3::X)),
|
|
"Y" => Ok((Vec3::ZERO, Vec3::Y)),
|
|
"Z" => Ok((Vec3::ZERO, Vec3::Z)),
|
|
_ => Err(bad(cmd, "axis must be X, Y, Z or {origin, dir}")),
|
|
},
|
|
Some(o @ Value::Object(_)) => {
|
|
let origin = o.get("origin").and_then(vec3).unwrap_or(Vec3::ZERO);
|
|
let dir = o.get("dir").and_then(vec3).and_then(|d| d.normalized()).ok_or_else(|| bad(cmd, "axis needs a non-zero `dir`"))?;
|
|
Ok((origin, dir))
|
|
}
|
|
_ => Err(bad(cmd, "`axis` is required")),
|
|
}
|
|
}
|
|
|
|
fn pattern_rect(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "PatternRectangular";
|
|
let features = source_features(s, p, cmd)?;
|
|
let dir1 = p.get("dir1").and_then(vec3).ok_or_else(|| bad(cmd, "`dir1` must be [x, y, z]"))?;
|
|
let count1 = req_expr(cmd, p, "count1")?;
|
|
let spacing1 = req_expr(cmd, p, "spacing1")?;
|
|
check_expr(s, &count1, Kind::Unitless, cmd, "count1")?;
|
|
check_expr(s, &spacing1, Kind::Length, cmd, "spacing1")?;
|
|
let dir2 = p.get("dir2").and_then(vec3);
|
|
let (count2, spacing2) = (expr(p, "count2"), expr(p, "spacing2"));
|
|
if let Some(c) = &count2 {
|
|
check_expr(s, c, Kind::Unitless, cmd, "count2")?;
|
|
}
|
|
if let Some(c) = &spacing2 {
|
|
check_expr(s, c, Kind::Length, cmd, "spacing2")?;
|
|
}
|
|
let pattern = solvecraft_doc::PatternKind::Rectangular { dir1, count1, spacing1, dir2, count2, spacing2 };
|
|
add_feature(s, p, FeatureKind::Pattern { features, pattern })
|
|
}
|
|
|
|
fn pattern_circ(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "PatternCircular";
|
|
let features = source_features(s, p, cmd)?;
|
|
let (origin, axis) = axis_line(p, cmd)?;
|
|
let count = req_expr(cmd, p, "count")?;
|
|
check_expr(s, &count, Kind::Unitless, cmd, "count")?;
|
|
let angle = expr(p, "angle").unwrap_or_else(|| "360 deg".into());
|
|
check_expr(s, &angle, Kind::Angle, cmd, "angle")?;
|
|
let pattern = solvecraft_doc::PatternKind::Circular { origin, axis, count, angle };
|
|
add_feature(s, p, FeatureKind::Pattern { features, pattern })
|
|
}
|
|
|
|
fn mirror(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "MirrorCommand";
|
|
let features = source_features(s, p, cmd)?;
|
|
let plane = match p.get("plane") {
|
|
Some(Value::String(n)) if solvecraft_geom::Plane::named(n).is_some() => solvecraft_doc::PlaneRef::Origin { name: n.to_ascii_uppercase() },
|
|
Some(o @ Value::Object(_)) => {
|
|
let origin = o.get("origin").and_then(vec3).unwrap_or(Vec3::ZERO);
|
|
let pl = match (o.get("x_dir").and_then(vec3), o.get("y_dir").and_then(vec3), o.get("normal").and_then(vec3)) {
|
|
(Some(x), Some(y), _) => solvecraft_geom::Plane::new(origin, x, y),
|
|
(_, _, Some(n)) => solvecraft_geom::Plane::from_normal(origin, n),
|
|
_ => None,
|
|
};
|
|
solvecraft_doc::PlaneRef::Custom { plane: pl.ok_or_else(|| bad(cmd, "plane needs x_dir and y_dir, or normal"))? }
|
|
}
|
|
_ => return Err(bad(cmd, "`plane` must be XY, XZ, YZ or {origin, normal}")),
|
|
};
|
|
add_feature(s, p, FeatureKind::Mirror { features, plane })
|
|
}
|
|
|
|
/// A plane reference from a parameter: an origin plane, a construction plane name, or an
|
|
/// explicit plane `{origin, x_dir, y_dir}` / `{origin, normal}`.
|
|
pub fn plane_param(s: &Session, v: Option<&Value>, cmd: &str) -> Result<solvecraft_doc::PlaneRef> {
|
|
use solvecraft_doc::PlaneRef;
|
|
match v {
|
|
Some(Value::String(n)) if solvecraft_geom::Plane::named(n).is_some() => Ok(PlaneRef::Origin { name: n.to_ascii_uppercase() }),
|
|
Some(Value::String(n)) => match s.doc.find_feature(n).map(|f| &f.kind) {
|
|
Some(FeatureKind::ConstructionPlane { .. }) => Ok(PlaneRef::Construction { name: n.clone() }),
|
|
_ => Err(bad(cmd, format!("no plane `{n}`"))),
|
|
},
|
|
Some(o @ Value::Object(_)) => {
|
|
let origin = o.get("origin").and_then(vec3).unwrap_or(Vec3::ZERO);
|
|
let pl = match (o.get("x_dir").and_then(vec3), o.get("y_dir").and_then(vec3), o.get("normal").and_then(vec3)) {
|
|
(Some(x), Some(y), _) => solvecraft_geom::Plane::new(origin, x, y),
|
|
(_, _, Some(n)) => solvecraft_geom::Plane::from_normal(origin, n),
|
|
_ => None,
|
|
};
|
|
Ok(PlaneRef::Custom { plane: pl.ok_or_else(|| bad(cmd, "plane needs x_dir and y_dir, or normal"))? })
|
|
}
|
|
_ => Err(bad(cmd, "`plane` must be XY, XZ, YZ, a construction plane name or {origin, normal}")),
|
|
}
|
|
}
|
|
|
|
fn plane_offset(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "ConstructionPlaneOffsetFromPlaneCommand";
|
|
let base = plane_param(s, p.get("base"), cmd)?;
|
|
let d = req_expr(cmd, p, "offset")?;
|
|
check_expr(s, &d, Kind::Length, cmd, "offset")?;
|
|
add_feature(s, p, FeatureKind::ConstructionPlane { plane: solvecraft_doc::PlaneRef::Offset { base: Box::new(base), distance: d } })
|
|
}
|
|
|
|
fn plane_angle(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "ConstructionPlaneAtAngleCommand";
|
|
let base = plane_param(s, p.get("base"), cmd)?;
|
|
let (axis_origin, axis_dir) = axis_line(p, cmd)?;
|
|
let angle = req_expr(cmd, p, "angle")?;
|
|
check_expr(s, &angle, Kind::Angle, cmd, "angle")?;
|
|
add_feature(
|
|
s,
|
|
p,
|
|
FeatureKind::ConstructionPlane { plane: solvecraft_doc::PlaneRef::AtAngle { base: Box::new(base), axis_origin, axis_dir, angle } },
|
|
)
|
|
}
|
|
|
|
fn split_body(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "FusionSplitBodyCommand";
|
|
let body = str_(p, "body").ok_or_else(|| bad(cmd, "`body` is required"))?.to_string();
|
|
if s.model.state().body(&body).is_none() {
|
|
return Err(bad(cmd, format!("no body `{body}`")));
|
|
}
|
|
let plane = plane_param(s, p.get("plane"), cmd)?;
|
|
add_feature(s, p, FeatureKind::Split { body, plane })
|
|
}
|
|
|
|
fn hole(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "FusionHoleCommand";
|
|
let position = p.get("position").and_then(vec3).ok_or_else(|| bad(cmd, "`position` must be [x, y, z]"))?;
|
|
let direction = match p.get("direction").and_then(vec3) {
|
|
Some(d) => d.normalized().ok_or_else(|| bad(cmd, "`direction` must be non-zero"))?,
|
|
None => {
|
|
// Into the planar face the position lies on.
|
|
let st = s.model.state();
|
|
let mut found = None;
|
|
for b in &st.bodies {
|
|
let tol = (b.body.size() * 1e-3).max(1e-3);
|
|
for f in b.body.faces(tol).unwrap_or_default() {
|
|
if let Some(n) = f.plane_normal
|
|
&& (position - f.centroid).dot(n).abs() < tol * 10.0
|
|
{
|
|
found = Some(-n);
|
|
}
|
|
}
|
|
}
|
|
found.ok_or_else(|| bad(cmd, "no planar face at `position`; give `direction`"))?
|
|
}
|
|
};
|
|
let diameter = req_expr(cmd, p, "diameter")?;
|
|
check_expr(s, &diameter, Kind::Length, cmd, "diameter")?;
|
|
let depth = expr(p, "depth");
|
|
if let Some(d) = &depth {
|
|
check_expr(s, d, Kind::Length, cmd, "depth")?;
|
|
}
|
|
let get = |k: &str| -> Result<String> {
|
|
let e = req_expr(cmd, p, k)?;
|
|
Ok(e)
|
|
};
|
|
let kind = match str_(p, "type").unwrap_or("simple") {
|
|
"simple" => match expr(p, "tip_angle") {
|
|
Some(t) if depth.is_some() => solvecraft_doc::HoleKind::Drilled { tip_angle: t },
|
|
_ => solvecraft_doc::HoleKind::Simple,
|
|
},
|
|
"drilled" => solvecraft_doc::HoleKind::Drilled { tip_angle: expr(p, "tip_angle").unwrap_or_else(|| "118 deg".into()) },
|
|
"counterbore" => solvecraft_doc::HoleKind::Counterbore { cb_diameter: get("cb_diameter")?, cb_depth: get("cb_depth")? },
|
|
"countersink" => solvecraft_doc::HoleKind::Countersink {
|
|
cs_diameter: get("cs_diameter")?,
|
|
cs_angle: expr(p, "cs_angle").unwrap_or_else(|| "90 deg".into()),
|
|
},
|
|
other => return Err(bad(cmd, format!("unknown hole type `{other}`"))),
|
|
};
|
|
add_feature(s, p, FeatureKind::Hole { position, direction, diameter, depth, hole: kind })
|
|
}
|
|
|
|
fn face_points(p: &Value, cmd: &str) -> Result<Vec<Vec3>> {
|
|
let a = p.get("faces").and_then(Value::as_array).ok_or_else(|| bad(cmd, "`faces` must be a list of points"))?;
|
|
if a.is_empty() || a.len() > 1000 {
|
|
return Err(bad(cmd, "select 1…1000 faces"));
|
|
}
|
|
a.iter().map(|v| vec3(v).or_else(|| v.get("point").and_then(vec3)).ok_or_else(|| bad(cmd, "a face is a point [x, y, z] on it"))).collect()
|
|
}
|
|
|
|
fn shell(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "FusionShellBodyCommand";
|
|
let faces = face_points(p, cmd)?;
|
|
let thickness = req_expr(cmd, p, "thickness")?;
|
|
check_expr(s, &thickness, Kind::Length, cmd, "thickness")?;
|
|
add_feature(s, p, FeatureKind::Shell { faces, thickness, body: str_(p, "body").map(str::to_string) })
|
|
}
|
|
|
|
fn draft(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "FusionDraftCommand";
|
|
let faces = face_points(p, cmd)?;
|
|
let angle = req_expr(cmd, p, "angle")?;
|
|
check_expr(s, &angle, Kind::Angle, cmd, "angle")?;
|
|
let neutral = plane_param(s, p.get("neutral"), cmd)?;
|
|
let (vals, _) = s.doc.param_values();
|
|
let pl = s.doc.resolve_plane(&vals, &neutral, 0)?;
|
|
let pull = p.get("pull").and_then(vec3).unwrap_or_else(|| pl.normal());
|
|
add_feature(s, p, FeatureKind::Draft { faces, angle, neutral, pull, body: str_(p, "body").map(str::to_string) })
|
|
}
|
|
|
|
fn sketch_id(s: &Session, v: Option<&Value>, cmd: &str, what: &str) -> Result<u64> {
|
|
let key = match v {
|
|
Some(Value::Number(n)) => n.to_string(),
|
|
Some(Value::String(x)) => x.clone(),
|
|
_ => return Err(bad(cmd, format!("`{what}` must be a sketch id or name"))),
|
|
};
|
|
match s.doc.find_feature(&key) {
|
|
Some(f) if matches!(f.kind, FeatureKind::Sketch { .. }) => Ok(f.id),
|
|
_ => Err(bad(cmd, format!("no sketch `{key}`"))),
|
|
}
|
|
}
|
|
|
|
fn sweep(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "Sweep";
|
|
let sketch = feature_sketch(s, p, cmd)?;
|
|
let path_sketch = sketch_id(s, p.get("path_sketch"), cmd, "path_sketch")?;
|
|
let path = string_list(p, "path");
|
|
if path.is_empty() {
|
|
return Err(bad(cmd, "`path` must list curve ids"));
|
|
}
|
|
add_feature(
|
|
s,
|
|
p,
|
|
FeatureKind::Sweep {
|
|
sketch,
|
|
profiles: profiles(p, cmd)?,
|
|
path_sketch,
|
|
path,
|
|
operation: operation(p, cmd)?,
|
|
targets: string_list(p, "targets"),
|
|
},
|
|
)
|
|
}
|
|
|
|
fn loft(s: &mut Session, p: &Value) -> Result<Value> {
|
|
let cmd = "SolidLoft";
|
|
let list = p.get("sections").and_then(Value::as_array).ok_or_else(|| bad(cmd, "`sections` must be a list"))?;
|
|
if list.len() < 2 || list.len() > 50 {
|
|
return Err(bad(cmd, "a loft needs 2…50 sections"));
|
|
}
|
|
let mut sections = Vec::new();
|
|
for sec in list {
|
|
let sketch = sketch_id(s, sec.get("sketch"), cmd, "sections[].sketch")?;
|
|
sections.push(solvecraft_doc::LoftSection { sketch, profiles: profiles(sec, cmd)? });
|
|
}
|
|
add_feature(s, p, FeatureKind::Loft { sections, operation: operation(p, cmd)?, targets: string_list(p, "targets") })
|
|
}
|