diff --git a/js/geo-polygons.js b/js/geo-polygons.js index c690f517..d56bcd63 100644 --- a/js/geo-polygons.js +++ b/js/geo-polygons.js @@ -626,8 +626,10 @@ var gs_base_polygons = exports; var p1 = newPoint(start.x - raySlope.dx * 1000, start.y - raySlope.dy * 1000, zpos, NOKEY), p2 = newPoint(start.x + raySlope.dx * 1000, start.y + raySlope.dy * 1000, zpos, NOKEY); + // store origin line for distance tests in print + if (i == 0) rayint.oline = [p1,p2]; + lines.push([p1,p2]); - start.x += stepX; start.y += stepY; } diff --git a/js/kiri-print.js b/js/kiri-print.js index 0e2405df..54aa8cd5 100644 --- a/js/kiri-print.js +++ b/js/kiri-print.js @@ -567,12 +567,14 @@ var gs_kiri_print = exports; } function outputFills(lines, bounds) { - var mindist, p1, p2, dist, point, find, list, len, lastout, pass = 0, origin; + var mindist, p1, p2, dist, point, find, list, len, lastout, origin, lastDist2Origin, + skip = false, + pass = 0; while (lines) { list = []; mindist = Infinity; - origin = antiBacklash && pass === 0 ? lines.origin : startPoint; + origin = skip || (antiBacklash && pass === 0) ? lines.origin : startPoint; // order all points by distance to last point for (i=0; i retractDist) { - addOutput(preout, p1.add({x:1,y:-1,z:0}), 0, moveSpeed); + addOutput(preout, p1.add({x:2,y:-2,z:0}), 0, moveSpeed); } // bridge ends of fill when they're close together diff --git a/js/kiri.js b/js/kiri.js index 3e20bb85..79347428 100644 --- a/js/kiri.js +++ b/js/kiri.js @@ -260,7 +260,7 @@ self.kiri.license = exports.LICENSE; sliceHeight: 0.25, sliceShells: 2, - sliceShellSpacing: 1, + sliceShellSpacing: 1.0, sliceFillAngle: 45, sliceFillOverlap: 0.3, sliceFillSpacing: 1.0, @@ -275,10 +275,10 @@ self.kiri.license = exports.LICENSE; sliceSupportExtra: 0, sliceSupportSpan: 6, - sliceSolidMinArea: 0.1, - sliceSolidLayers: 2, + sliceSolidMinArea: 5, + sliceSolidLayers: 3, sliceBottomLayers: 2, - sliceTopLayers: 2, + sliceTopLayers: 3, sliceVase: false, firstSliceHeight: 0.25, @@ -298,13 +298,13 @@ self.kiri.license = exports.LICENSE; outputFillMult: 1.2, outputSparseMult: 1.3, outputRetractOver: 5.0, - outputRetractDist: 0.5, + outputRetractDist: 1.0, outputRetractSpeed: 40, - outputRetractDwell: 20, + outputRetractDwell: 30, outputBrimCount: 2, - outputBrimOffset: 3, + outputBrimOffset: 2, outputShortPoly: 15.0, - outputShortDistance: 5.0, + outputShortDistance: 0.0, outputShortFactor: 0.2, outputFinishFactor: 0, detectThinWalls: false,