diff --git a/js/kiri-driver-fdm.js b/js/kiri-driver-fdm.js index 9486f403..18fdae50 100644 --- a/js/kiri-driver-fdm.js +++ b/js/kiri-driver-fdm.js @@ -181,19 +181,19 @@ var gs_kiri_fdm = exports; // console.log({polish_update}); }); // compute y polishing slices - // SLICER.sliceWidget(widget, { - // height: sdev.nozzleSize, - // swapX: false, - // swapY: true, - // simple: true - // }, (polish_done => { - // widget.polish.y = polish_done - // .filter(s => s.groups.length) - // .map(s => s.groups) - // .forEach(p => pa.appendAll(p)); - // }), (polish_update) => { - // // console.log({polish_update}); - // }); + SLICER.sliceWidget(widget, { + height: sdev.nozzleSize, + swapX: false, + swapY: true, + simple: true + }, (polish_done => { + widget.polish.y = polish_done + .filter(s => s.groups.length) + .map(s => s.groups) + .forEach(p => pa.appendAll(p)); + }), (polish_update) => { + // console.log({polish_update}); + }); // apply polishing finishes to layers forSlices(1.0, 1.0, slice => { if (slice.index >= polish) { diff --git a/js/kiri-print.js b/js/kiri-print.js index 8680adea..8370f6e2 100644 --- a/js/kiri-print.js +++ b/js/kiri-print.js @@ -597,7 +597,7 @@ var gs_kiri_print = exports; /** * @param {Polygon[]} polys */ - function outputSparse(polys, bounds) { + function outputSparse(polys, extrude) { if (!polys) return; var proxy = polys.map(function(poly) { return {poly: poly, first: poly.first(), last: poly.last()}; @@ -611,7 +611,7 @@ var gs_kiri_print = exports; if (i === 0 && lp && lp.distTo2D(p) > retractDist && intersectsTop(lp,p)) { retract(); } - addOutput(preout, p, i === 0 ? 0 : sparseMult, printSpeed); + addOutput(preout, p, i === 0 ? 0 : extrude, printSpeed); lp = p; }); }); @@ -794,7 +794,7 @@ var gs_kiri_print = exports; // then output solid and sparse fill outputFills(next.fill_lines); - outputSparse(next.fill_sparse); + outputSparse(next.fill_sparse, sparseMult); lastTop = next; } @@ -806,7 +806,7 @@ var gs_kiri_print = exports; if (slice.tops.length) { let polish = slice.tops[0].polish; if (polish) { - outputTraces(polish, 0); + outputSparse(polish, 0); } }