fix part offset path routing. fix another empty top case

2020-11-17 00:53:17 -05:00 · 2020-11-17 00:53:17 -05:00 · e3d91fbdc4
commit e3d91fbdc4
parent 8ac7d3b89a
2 changed files with 5 additions and 5 deletions
--- a/src/kiri/slicer2.js
+++ b/src/kiri/slicer2.js
@ -268,7 +268,7 @@
            }

            const haslines = lines.length || opt.emptyok;
-            const hastops = !opt.genso || retn.tops.length || opt.notopok;
+            const hastops = !opt.genso || opt.notopok || (retn.tops && retn.tops.length);

            if (opt.each && haslines && hastops) {
                opt.each(retn, index, total, UTIL.time() - mark);
--- a/src/mode/cam/prepare.js
+++ b/src/mode/cam/prepare.js
@ -258,10 +258,10 @@
                if ((bigXY || bigZ) && (isMove || midZ)) {
                    let maxz = getZClearPath(
                            terrain,
-                            lastPoint.x,
-                            lastPoint.y,
-                            point.x,
-                            point.y,
+                            lastPoint.x - wmx,
+                            lastPoint.y - wmy,
+                            point.x - wmx,
+                            point.y - wmy,
                            Math.max(point.z, lastPoint.z),
                            zadd,
                            maxToolDiam/2,