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

fix thin wall retraction. remove point markers to allow codec between minion n worker

Browse source
This commit is contained in:
Stewart Allen 2025-09-22 00:09:41 -04:00
commit 9567a99fd9
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -430,14 +430,13 @@ function trace_noodle(noodle, noodleWidth, minR, midR, maxR, opt = {}) {
let parent = new Polygon(); let parent = new Polygon();
let inner = []; let inner = [];
for (let poly of insetp.flattenTo([])) { for (let poly of insetp.flattenTo([])) {
let sno = poly.parent ? shell : -shell; // shell number (- for inner/hole)
let nupoly = poly.parent ? new Polygon() : parent; let nupoly = poly.parent ? new Polygon() : parent;
if (poly.parent) { if (poly.parent) {
inner.push(nupoly); inner.push(nupoly);
} }
let ltpo; let ltpo;
let trace = []; let trace = [];
trace.shell = sno; trace.shell = poly.parent ? shell : -shell; // shell number (- for inner/hole)
poly.segment(minR, true).forEachSegment((p1, p2) => { poly.segment(minR, true).forEachSegment((p1, p2) => {
let np1 = { x:(p1.x+p2.x)/2, y:(p1.y+p2.y)/2 }; let np1 = { x:(p1.x+p2.x)/2, y:(p1.y+p2.y)/2 };
let len = pointDist(p1, p2); let len = pointDist(p1, p2);
@ -511,7 +510,7 @@ function trace_noodle(noodle, noodleWidth, minR, midR, maxR, opt = {}) {
// and adding that to the new trace // and adding that to the new trace
traces.push(trace); traces.push(trace);
let nutrace = [ trace.pop() ]; let nutrace = [ trace.pop() ];
nutrace.shell = sno; nutrace.shell = trace.shell;
// close last trace if endpoints near enough // close last trace if endpoints near enough
if (pointDist(ltpo, trace[0] <= maxR)) { if (pointDist(ltpo, trace[0] <= maxR)) {
trace.push(trace[0]); trace.push(trace[0]);
@ -551,6 +550,13 @@ function trace_noodle(noodle, noodleWidth, minR, midR, maxR, opt = {}) {
remain.push(...ret); remain.push(...ret);
} }
// remove point.segment markers for codec encoding between minion and worker
for (let trace of traces) {
for (let pt of trace) {
delete pt.s;
}
}
return { lines, polys, remain, traces }; return { lines, polys, remain, traces };
} }

4
src/kiri/mode/fdm/prepare.js
View file

@ -1126,6 +1126,10 @@ function slicePrintPath(print, slice, startPoint, offset, output, opt = {}) {
} }
// remove emitted trace // remove emitted trace
thin = thin.filter(t => t !== trace); thin = thin.filter(t => t !== trace);
// retract if moving > retractDist
if (np && np.distTo2D(new Point(trace[0].x, trace[0].y)) > retractDist) {
retract();
}
for (let pt of trace) { for (let pt of trace) {
np = new Point(pt.x, pt.y, z); np = new Point(pt.x, pt.y, z);
if (pt === trace[0]) { if (pt === trace[0]) {