From 959ba8f8afd301a77027257e5778d2cb39f0fa77 Mon Sep 17 00:00:00 2001
From: Stewart Allen <sa@grid.space>
Date: Sun, 23 Jan 2022 21:15:39 -0500
Subject: [PATCH] move cam slicer into cam package

---
 app.js                                           | 2 +-
 src/kiri-mode/cam/ops.js                         | 4 ++--
 src/kiri-mode/cam/slice.js                       | 4 ++--
 src/{kiri/slicer2.js => kiri-mode/cam/slicer.js} | 2 +-
 src/kiri-mode/cam/topo.js                        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/{kiri/slicer2.js => kiri-mode/cam/slicer.js} (99%)

diff --git a/app.js b/app.js
index 858bb20a..3952ae3e 100644
--- a/app.js
+++ b/app.js
@@ -390,7 +390,6 @@ const script = {
         "kiri/pack",
         "kiri/slice",
         "kiri/slicer",
-        "kiri/slicer2",
         "kiri/layers",
         "kiri-mode/fdm/fill",
         "kiri-mode/fdm/driver",
@@ -402,6 +401,7 @@ const script = {
         "kiri-mode/sla/export",
         "kiri-mode/sla/x_cxdlp",
         "kiri-mode/sla/x_photon",
+        "kiri-mode/cam/slicer",
         "kiri-mode/cam/driver",
         "kiri-mode/cam/ops",
         "kiri-mode/cam/tool",
diff --git a/src/kiri-mode/cam/ops.js b/src/kiri-mode/cam/ops.js
index 8a16acfd..a64fbce6 100644
--- a/src/kiri-mode/cam/ops.js
+++ b/src/kiri-mode/cam/ops.js
@@ -1149,7 +1149,7 @@
 
         slice(progress) {
             let { widget, sliceAll } = this.state;
-            let slicer = new KIRI.slicer2(widget.getPoints(), {
+            let slicer = new KIRI.cam_slicer(widget.getPoints(), {
                 zlist: true,
                 zline: true
             });
@@ -1282,7 +1282,7 @@
                 where = {under: [], over: [], on: []};
             }
             if (where) {
-                let { checkOverUnderOn, intersectPoints } = self.kiri.slicer2;
+                let { checkOverUnderOn, intersectPoints } = self.kiri.cam_slicer;
                 checkOverUnderOn(newPoint(a.x, a.y, a.z), z, where);
                 checkOverUnderOn(newPoint(b.x, b.y, b.z), z, where);
                 checkOverUnderOn(newPoint(c.x, c.y, c.z), z, where);
diff --git a/src/kiri-mode/cam/slice.js b/src/kiri-mode/cam/slice.js
index 7ff28b99..b3261b93 100644
--- a/src/kiri-mode/cam/slice.js
+++ b/src/kiri-mode/cam/slice.js
@@ -93,7 +93,7 @@
         }
 
         let mark = Date.now();
-        let slicer = new KIRI.slicer2(widget.getPoints(), {
+        let slicer = new KIRI.cam_slicer(widget.getPoints(), {
             zlist: true,
             zline: true
         });
@@ -232,7 +232,7 @@
             // do no work if cached
             return false;
         }
-        let slicer = new KIRI.slicer2(widget.getPoints(), {
+        let slicer = new KIRI.cam_slicer(widget.getPoints(), {
             zlist: true,
             zline: true
         });
diff --git a/src/kiri/slicer2.js b/src/kiri-mode/cam/slicer.js
similarity index 99%
rename from src/kiri/slicer2.js
rename to src/kiri-mode/cam/slicer.js
index 74b3ed05..ee901f57 100644
--- a/src/kiri/slicer2.js
+++ b/src/kiri-mode/cam/slicer.js
@@ -845,6 +845,6 @@
     Slicer.checkOverUnderOn = checkOverUnderOn;
     Slicer.intersectPoints = intersectPoints;
 
-    self.kiri.slicer2 = Slicer;
+    self.kiri.cam_slicer = Slicer;
 
 })();
diff --git a/src/kiri-mode/cam/topo.js b/src/kiri-mode/cam/topo.js
index 346d7677..7edcdfda 100644
--- a/src/kiri-mode/cam/topo.js
+++ b/src/kiri-mode/cam/topo.js
@@ -385,7 +385,7 @@
                 ondone(newslices);
             }
 
-            let slicer = new KIRI.slicer2(widget.getPoints(), {
+            let slicer = new KIRI.cam_slicer(widget.getPoints(), {
                 swapX: true, emptyok: true, notopok: true
             });
             let sindex = slicer.interval(resolution);