From 228165e0219f62cec66f73a3e278832698282823 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Fri, 15 Dec 2017 09:31:53 -0500
Subject: [PATCH] add outer shell first option

---
 js/kiri-print.js | 19 ++++++++++---------
 js/kiri.js       |  3 +++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/js/kiri-print.js b/js/kiri-print.js
index a487ad12..8caf7738 100644
--- a/js/kiri-print.js
+++ b/js/kiri-print.js
@@ -478,6 +478,7 @@ var gs_kiri_print = exports;
             firstSpeed = process.firstLayerRate,
             printSpeed = firstLayer ? firstSpeed : process.outputFeedrate,
             moveSpeed = process.outputSeekrate,
+            outerFirst = process.outputOuterFirst,
             origin = startPoint.add(offset),
             z = slice.z;
 
@@ -511,14 +512,12 @@ var gs_kiri_print = exports;
             startPoint = preout[preout.length - 1].point;
         }
 
-        function outputTraces(poly, bounds, last) {
+        function outputTraces(poly, bounds, newTop) {
             if (!poly) return;
             if (Array.isArray(poly)) {
-                var lastPoly = null;
                 outputOrderClosest(poly, function(next) {
-                    outputTraces(next, bounds, lastPoly);
-                    lastPoly = next;
-                });
+                    outputTraces(next, bounds);
+                }, null, newTop);
             } else {
                 var finishShell = poly.depth === 0 && !firstLayer;
                 startPoint = scope.polyPrintPath(poly, startPoint, preout, {
@@ -661,7 +660,7 @@ var gs_kiri_print = exports;
          * @param {Function} fn
          * @param {Function} fnp convert 'next' object into a Polygon
          */
-        function outputOrderClosest(array, fn, fnp) {
+        function outputOrderClosest(array, fn, fnp, newTop) {
             if (array.length === 1) {
                 return fn(array[0]);
             }
@@ -674,13 +673,15 @@ var gs_kiri_print = exports;
                     next = array[i];
                     if (!next) continue;
                     poly = fnp ? fnp(next) : next;
+                    if (outerFirst && newTop && poly.depth !== 0) continue;
                     find = poly.findClosestPointTo(startPoint);
                     order.push({
                         i: i,
                         n: next,
-                        d: find.distance - (poly.depth * thinWall),
+                        d: find.distance - (poly.depth * thinWall * (outerFirst?0:1)),
                     });
                 }
+                newTop = false;
                 if (order.length === 0) {
                     return;
                 }
@@ -706,13 +707,13 @@ var gs_kiri_print = exports;
                 }
             } else {
                 // when skipping between tops, first perform a wipe
-                if (lastTop && lastTop !== next && wipe) {
+                if (lastTop && wipe) {
                     outputWipe(wipe);
                     wipe = null;
                 }
                 // top object
                 var bounds = POLY.flatten(next.gatherOuter([]));
-                outputTraces([].appendAll(next.traces).appendAll(next.innerTraces() || []), bounds);
+                outputTraces([].appendAll(next.traces).appendAll(next.innerTraces() || []), bounds, !lastTop);
                 outputFills(next.fill_lines, bounds);
                 outputSparse(next.fill_sparse, bounds);
                 if (next.inner) {
diff --git a/js/kiri.js b/js/kiri.js
index 7ba2d32b..e986fb1b 100644
--- a/js/kiri.js
+++ b/js/kiri.js
@@ -79,6 +79,7 @@ self.kiri.license = exports.LICENSE;
                     outputBrimOffset: 1,
                     outputShortDistance: 1,
                     outputShortFactor: 1,
+                    outputOuterFirst: 1,
                     outputWipeSpeed: 1,
                     outputWipeDistance: 1,
                     outputClockwise: 1,
@@ -275,6 +276,7 @@ self.kiri.license = exports.LICENSE;
                 outputBrimOffset: 3,
                 outputShortDistance: 5.0,
                 outputShortFactor: 0.2,
+                outputOuterFirst: true,
 
                 // --- LASER ---
 
@@ -2360,6 +2362,7 @@ self.kiri.license = exports.LICENSE;
             outputWipeDistance: UC.newInput("wipe distance", {title:"distance to wipe nozzle after\neach enclosed island completes\nin millimeters. 0 to disable", convert:UC.toInt, modes:FDM}),
             outputShortDistance: UC.newInput("short distance", {title:"segment length cutoff\nfor short segments\nin millimeters", bound:UC.bound(0,200), convert:UC.toFloat, modes:FDM}),
             outputShortFactor: UC.newInput("short factor", {title:"max speed reduction factor\nfor short segments\nas % of print speed", bound:UC.bound(0.05,1), convert:UC.toFloat, modes:FDM}),
+            outputOuterFirst: UC.newBoolean("outer first", onBooleanClick, {title: "output outermost shell first", modes:FDM}),
         });
 
         function toolUpdate(a,b,c) {