AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re-add gaps visualization. remove unused inset iteration for single intersections

Browse source
This commit is contained in:
Stewart Allen 2025-09-19 12:13:02 -04:00
commit e55a8328e3
1 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/kiri/mode/fdm/post.js
View file

@ -164,11 +164,14 @@ function thin_type_2(params) {
function thin_type_3(params) { function thin_type_3(params) {
// offsetN usually = extrusion width (nozzle diameter) // offsetN usually = extrusion width (nozzle diameter)
let { z, top, count, offsetN, last, gaps } = params; let { z, top, count, offsetN } = params;
// produce trace from outside of poly inward no more than max inset // produce trace from outside of poly inward no more than max inset
let noodleWidth = offsetN * count; let noodleWidth = offsetN * count;
let { noodle,} = top.poly.noodle(noodleWidth); let { noodle, remain } = top.poly.noodle(noodleWidth);
// remaining area for infill after shells are extruded
let gaps = top.gaps = remain;
// render inset "noodle" // render inset "noodle"
// shells.appendAll(noodle); // shells.appendAll(noodle);
@ -189,6 +192,7 @@ function thin_type_3(params) {
for (let i=0; i<count; i++) { for (let i=0; i<count; i++) {
let remain = []; let remain = [];
// process each top level noodle separately
for (let n of noodle) for (let n of noodle)
trace_noodle( trace_noodle(
[ n ], [ n ],
@ -206,26 +210,24 @@ function thin_type_3(params) {
showChainIntersect: false showChainIntersect: false
}); });
console.log({ remain });
// show remaining noodle after single trace // show remaining noodle after single trace
shells.push(...POLY.flatten(remain)); // shells.push(...POLY.setZ(POLY.flatten(remain), z));
noodle = remain; noodle = remain;
} }
console.log({ lines, polys, trace }); // console.log({ lines, polys, trace });
// show extrusion // show extrusion
for (let point of trace) { for (let point of trace) {
shells.push(newPolygon().centerCircle(point, point.r, 12)); shells.push(newPolygon().centerCircle(point, point.r, 12).setZ(z));
} }
POLY.setZ([...lines, ...polys], z); POLY.setZ([...lines, ...polys], z);
thin.push(...lines); thin.push(...lines);
shells.push(...polys); shells.push(...polys);
return { last, gaps }; return { trace, gaps };
} }
// trace a single extrusion line around the inside of the noodle poly // trace a single extrusion line around the inside of the noodle poly
@ -375,7 +377,7 @@ function trace_noodle(noodle, noodleWidth, minR, midR, maxR, opt = {}) {
// construct medial axis lines. this appears to produce duplicate // construct medial axis lines. this appears to produce duplicate
// reverse segments in a subset of cases // reverse segments in a subset of cases
let ma = JSPoly.construct_medial_axis(out, inr); let ma = JSPoly.construct_medial_axis(out, inr);
// dedup the points so we can track them uniquely (for chain intersections) // dedup the points so we can track them uniquely
for (let { point0, point1 } of ma) { for (let { point0, point1 } of ma) {
pointsToLine(point0, point1); pointsToLine(point0, point1);
} }
@ -427,7 +429,8 @@ function trace_noodle(noodle, noodleWidth, minR, midR, maxR, opt = {}) {
} }
} }
// project inset segment normals onto closest chain // project inset segment normals onto closest medial segment
// use this to find a radius which we divide into extrusion lanes
if (!brute) if (!brute)
for (let insetp of inset) { for (let insetp of inset) {
let { intersectRayLine } = base.util; let { intersectRayLine } = base.util;
@ -463,6 +466,7 @@ function trace_noodle(noodle, noodleWidth, minR, midR, maxR, opt = {}) {
nupoly.push(new Point(min.x, min.y)); nupoly.push(new Point(min.x, min.y));
return; return;
} }
// use intersection off and divide into extrusion lanes
let pop = div(mr); let pop = div(mr);
let odd = (pop.length % 2 === 1); let odd = (pop.length % 2 === 1);
let len = Math.ceil(pop.length / 2); let len = Math.ceil(pop.length / 2);
@ -475,21 +479,19 @@ function trace_noodle(noodle, noodleWidth, minR, midR, maxR, opt = {}) {
} }
let op; let op;
if (pop.length === 1) { if (pop.length === 1) {
nupoly.push(new Point(min.x, min.y));
// for single wall place it exactly on medial axis // for single wall place it exactly on medial axis
nupoly.push(new Point(min.x, min.y));
trace.push(op = { x: min.x, y: min.y, r: mr }) trace.push(op = { x: min.x, y: min.y, r: mr })
} else { } else {
let off = -dstep; // otherwise use first division
// otherwise use divisions // compensate for minimal inset
for (let i=0; i<1; i++) { let off = -dstep + pop[0];
off += (pop[i] * (i ? 2 : 1));
trace.push(op = { trace.push(op = {
x: np1.x + dy * off, x: np1.x + dy * off,
y: np1.y - dx * off, y: np1.y - dx * off,
r: pop[0] r: pop[0]
}) })
} // trace inset by full diameter
off += dstep / 2;
nupoly.push(new Point(np1.x + dy * off * 2, np1.y - dx * off * 2)); nupoly.push(new Point(np1.x + dy * off * 2, np1.y - dx * off * 2));
} }
if (odd && !mp1.claimed) { if (odd && !mp1.claimed) {
@ -569,7 +571,7 @@ export function doTopShells(z, top, count, offset1, offsetN, fillOffset, opt = {
ret = thin_type_2({ z, top, count, top_poly, offset1, offsetN, fillOffset, gaps, wasm }); ret = thin_type_2({ z, top, count, top_poly, offset1, offsetN, fillOffset, gaps, wasm });
break; break;
case "type 3": case "type 3":
ret = thin_type_3({ z, top, count, top_poly, offsetN }); ret = thin_type_3({ z, top, count, offsetN });
break; break;
default: default:
ret = offset_default({ z, top, count, top_poly, offset1, offsetN, wasm }); ret = offset_default({ z, top, count, top_poly, offset1, offsetN, wasm });