From 6318aad17195bfdf5807c50d785e8e7ce3d318ce Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Fri, 25 Dec 2020 13:15:49 -0500
Subject: [PATCH] better trace contrast. improve trace routing. trace observes
 conventional setting

---
 src/mode/cam/client.js  | 8 ++++----
 src/mode/cam/ops.js     | 5 ++++-
 src/mode/cam/prepare.js | 7 +------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/mode/cam/client.js b/src/mode/cam/client.js
index b1e6df6e..2c350ab6 100644
--- a/src/mode/cam/client.js
+++ b/src/mode/cam/client.js
@@ -348,7 +348,7 @@
         let showTab, lastTab, tab, iw, ic;
         api.event.on("cam.tabs.add", func.tabAdd = () => {
             func.traceDone();
-            alert = api.show.alert("[esc] key cancels tab editing");
+            alert = api.show.alert("[esc] cancels tab editing");
             api.feature.hover = true;
             func.hover = func.tabHover;
             func.hoverUp = func.tabHoverUp;
@@ -441,7 +441,7 @@
             traceOn.classList.add("editing");
             CAM.traces((ids) => {
                 api.hide.alert(alert);
-                alert = api.show.alert("[esc] key cancels trace editing");
+                alert = api.show.alert("[esc] cancels trace editing");
                 KIRI.api.widgets.opacity(0.5);
                 KIRI.api.widgets.for(widget => {
                     if (ids.indexOf(widget.id) >= 0) {
@@ -459,7 +459,7 @@
                     widget.traces.forEach(poly => {
                         let match = areas.filter(arr => poly.matches(arr));
                         let layers = new KIRI.Layers();
-                        layers.setLayer("trace", {line: 0x88aa55}, false).addPoly(poly);
+                        layers.setLayer("trace", {line: 0xaaaa55}, false).addPoly(poly);
                         stack.addLayers(layers);
                         stack.new_meshes.forEach(mesh => {
                             mesh.trace = {widget, poly};
@@ -573,7 +573,7 @@
                 color.b = colorSave.b = 0.1;
                 if (!skip) wlist.push(poly._trace);
             } else {
-                color.r = colorSave.r = 0x88/255;
+                color.r = colorSave.r = 0xaa/255;
                 color.g = colorSave.g = 0xaa/255;
                 color.b = colorSave.b = 0x55/255;
                 if (!skip) wlist.remove(poly._trace);
diff --git a/src/mode/cam/ops.js b/src/mode/cam/ops.js
index a91fc5f5..c7efd1ff 100644
--- a/src/mode/cam/ops.js
+++ b/src/mode/cam/ops.js
@@ -660,16 +660,19 @@
         slice(progress) {
             let { op, state } = this;
             let { settings, widget, sliceAll, updateToolDiams } = state;
+            let { process } = settings;
+            let { tool, rate, plunge } = op;
             // generate tracing offsets from chosen features
             let sliceOut = this.sliceOut = [];
             let areas = op.areas[widget.id] || [];
-            let { tool, rate, plunge } = op;
             let traceTool = new CAM.Tool(settings, tool);
             let traceToolDiam = traceTool.fluteDiameter();
+            let cutdir = process.camConventional;
             updateToolDiams(traceToolDiam);
             areas.forEach(arr => {
                 let slice = newSlice();
                 let poly = newPolygon().fromArray(arr);
+                POLY.setWinding([ poly ], cutdir, false);
                 slice.addTop(poly);
                 slice.camLines = [ poly ];
                 slice.camTrace = { tool, rate, plunge };
diff --git a/src/mode/cam/prepare.js b/src/mode/cam/prepare.js
index 4488fd58..11945e2d 100644
--- a/src/mode/cam/prepare.js
+++ b/src/mode/cam/prepare.js
@@ -391,12 +391,7 @@
             setTool(tool, rate, plunge);
             let traceTool = new CAM.Tool(settings, tool);
             let traceToolDiam = traceTool.fluteDiameter();
-            slice.camLines.forEach(poly => {
-                let idx = 0, close = !poly.open;
-                poly.forEachPoint(point => {
-                    camOut(point.clone(), idx++ > 0);
-                }, close);
-            });
+            printPoint = poly2polyEmit(slice.camLines, printPoint, polyEmit);
             newLayer();
         }