masi/solvecraft
1
0
Fork 0
mirror of https://github.com/bherbruck/solidcraft.git synced 2026-11-04 02:55:54 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

doc: plastic features' tools stand on the face as drawn

Browse Source 
The boss's post and ribs, the boss's hole, the snap fit's arm and the rest started a few
hundredths of their height inside the material (and the hole and the groove ran on as far
past the face), and the groove's cutter reached past the rim edge into the free side, so no
face of a tool lay on a face of the part. SMLib joins and cuts touching faces exactly: each
tool is now the feature's own shape, from the face (a drafted post or rest sized at the
face, the groove's band the rim's own, free reach 0). The material each adds or removes is
the same.

kernel::rim_band's `free` is now always 0 from the doc.

(not built: base in progress)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017itGh5fpMEousnZ91cYcVt
This commit is contained in:
jyviko
2026-10-22 07:36:48 -04:00
parent 712caf8bf4
commit 431c3f6d0c
1 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/doc/src/eval_more.rs
+21 -29
View File
@@ -1884,7 +1884,7 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
let rule = |target: &str| -> Result<Option<crate::plastic::PlasticValues>> {
doc.plastic_rule_for(target).map(|r| doc.plastic_values(vals, &r)).transpose()
};
// Tools start a little inside the material so they overlap it instead of touching a face.
// Each tool stands on the face as drawn: SMLib joins and cuts touching faces exactly.
match &f.kind {
FeatureKind::Boss {
position,
@@ -1916,16 +1916,14 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
if r_top <= 0.0 {
return Err(DocError::Invalid("the draft closes the boss before its top".into()));
}
let delta = (h * 0.05).clamp(1e-3, 0.5);
let (x, _, z) = local_frame(direction.0, None)?;
// The post: a (tapered) cylinder from a little inside the face.
let base = Plane::new(position.0 - z * delta, x, z.cross(x)).ok_or_else(|| DocError::Invalid("boss frame".into()))?;
let r_in = r0 + delta * dr.tan();
let disc = Region2 { outer: Loop2::circle(Vec2::ZERO, r_in), holes: Vec::new() };
// The post: a (tapered) cylinder standing on the face.
let base = Plane::new(position.0, x, z.cross(x)).ok_or_else(|| DocError::Invalid("boss frame".into()))?;
let disc = Region2 { outer: Loop2::circle(Vec2::ZERO, r0), holes: Vec::new() };
let post = if dr.abs() > 1e-12 {
vec![kernel::extrude_tapered(&base, &disc, h + delta, 1.0, -dr)?]
vec![kernel::extrude_tapered(&base, &disc, h, 1.0, -dr)?]
} else {
kernel::extrude(&base, &[disc], 0.0, h + delta)?
kernel::extrude(&base, &[disc], 0.0, h)?
};
let mut tools: Vec<Traced> = post.into_iter().map(|b| crate::lineage::part_tool(b, "post")).collect();
if let Some(n) = ribs {
@@ -1964,7 +1962,7 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
]),
holes: Vec::new(),
};
tools.extend(kernel::extrude(&rp, &[rect], -delta, hr)?.into_iter().map(|b| crate::lineage::part_tool(b, &format!("rib{k}"))));
tools.extend(kernel::extrude(&rp, &[rect], 0.0, hr)?.into_iter().map(|b| crate::lineage::part_tool(b, &format!("rib{k}"))));
}
}
apply_traced(doc, st, f, tools, Operation::Join, std::slice::from_ref(&target))?;
@@ -1989,7 +1987,7 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
return Err(DocError::Invalid("the boss hole must fit inside the boss".into()));
}
let hp = Plane::new(position.0, x, z.cross(x)).ok_or_else(|| DocError::Invalid("hole frame".into()))?;
let tool = kernel::extrude(&hp, &[Region2 { outer: Loop2::circle(Vec2::ZERO, rh), holes: Vec::new() }], h - depth, h + delta)?;
let tool = kernel::extrude(&hp, &[Region2 { outer: Loop2::circle(Vec2::ZERO, rh), holes: Vec::new() }], h - depth, h)?;
let tool = tool.into_iter().map(|b| crate::lineage::part_tool(b, "hole")).collect();
apply_traced(doc, st, f, tool, Operation::Cut, std::slice::from_ref(&target))?;
}
@@ -2049,12 +2047,10 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
*slot = ModelBody::traced_new(target.clone(), Traced::step(b, &[&mb.traced()]), slot.feature);
return Ok(());
}
// A groove: the band along the chosen edge, inside the rim face, and its gap. The
// cutter reaches past the edge into the free side (the cavity, or outside).
let bw = w + g;
let (plane, band) = kernel::rim_band(&mb.body, face.0, bw, bw, *outside)?;
let delta = (h * 0.05).clamp(1e-3, 0.5);
let tool = kernel::extrude(&plane, &[band], -(h + g), delta)?.into_iter().map(|b| crate::lineage::part_tool(b, "groove")).collect();
// A groove: the band along the chosen edge, inside the rim face, its gap included,
// cut down from the face.
let (plane, band) = kernel::rim_band(&mb.body, face.0, w + g, 0.0, *outside)?;
let tool = kernel::extrude(&plane, &[band], -(h + g), 0.0)?.into_iter().map(|b| crate::lineage::part_tool(b, "groove")).collect();
apply_traced(doc, st, f, tool, Operation::Cut, std::slice::from_ref(&target))
}
FeatureKind::SnapFit { position, direction, hook, length, thickness, width, catch_depth, catch_length, base_height, new_body, body } => {
@@ -2067,11 +2063,9 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
return Err(DocError::Invalid("the snap fit's catch must be shorter than its arm".into()));
}
let (x, y, z) = local_frame(direction.0, Some(hook.0))?;
let delta = (l * 0.05).clamp(1e-3, 0.5);
// Side profile (x = toward the catch, y = up the arm), extruded across the width.
// The base reaches `base_height` below the face; a joined arm bites `delta` into
// the wall, a separate body sits flush on it.
let y0 = if *new_body { -bh } else { -delta - bh };
// The base reaches `base_height` below the face, joined or a separate body.
let y0 = -bh;
let pts = [Vec2::new(-t, y0), Vec2::new(0.0, y0), Vec2::new(0.0, l - cl), Vec2::new(cd, l - cl), Vec2::new(0.0, l), Vec2::new(-t, l)];
let o = position.0 - y * (w / 2.0);
let pl = Plane::new(o, x, z).ok_or_else(|| DocError::Invalid("snap fit frame".into()))?;
@@ -2110,10 +2104,8 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
if closes {
return Err(DocError::Invalid("the draft closes the rest before its top".into()));
}
let delta = (h * 0.05).clamp(1e-3, 0.5);
let (x, y, z) = local_frame(direction.0, along.map(Vec3::from))?;
// Sized at the face: the tool starts a little inside, grown by the draft over that.
let e = delta * dr.tan();
let (x, y, _) = local_frame(direction.0, along.map(Vec3::from))?;
// Sized at the face, where the tool starts.
let shape = |grow: f64| match l {
Some(l) => Loop2::polygon(&[
Vec2::new(-l / 2.0 - grow, -w / 2.0 - grow),
@@ -2124,15 +2116,15 @@ pub(super) fn plastic_eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &F
None => Loop2::circle(Vec2::ZERO, w / 2.0 + grow),
};
let holes = match t {
Some(t) => vec![shape(-t - e).reversed()],
Some(t) => vec![shape(-t).reversed()],
None => Vec::new(),
};
let region = Region2 { outer: shape(e), holes };
let base = Plane::new(position.0 - z * delta, x, y).ok_or_else(|| DocError::Invalid("rest frame".into()))?;
let region = Region2 { outer: shape(0.0), holes };
let base = Plane::new(position.0, x, y).ok_or_else(|| DocError::Invalid("rest frame".into()))?;
let tool = if dr.abs() > 1e-12 {
vec![kernel::extrude_tapered(&base, &region, h + delta, 1.0, -dr)?]
vec![kernel::extrude_tapered(&base, &region, h, 1.0, -dr)?]
} else {
kernel::extrude(&base, &[region], 0.0, h + delta)?
kernel::extrude(&base, &[region], 0.0, h)?
};
let tool = tool.into_iter().map(|b| crate::lineage::part_tool(b, "rest")).collect();
apply_traced(doc, st, f, tool, Operation::Join, std::slice::from_ref(&target))