AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move cam slicer into cam package

Browse source
This commit is contained in:
Stewart Allen 2022-01-23 21:15:39 -05:00
commit 959ba8f8af
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app.js
View file

@ -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",

4
src/kiri-mode/cam/ops.js
View file

@ -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);

4
src/kiri-mode/cam/slice.js
View file

@ -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
});

2
src/kiri/slicer2.js → src/kiri-mode/cam/slicer.js
View file

@ -845,6 +845,6 @@
Slicer.checkOverUnderOn = checkOverUnderOn;
Slicer.intersectPoints = intersectPoints;
self.kiri.slicer2 = Slicer;
self.kiri.cam_slicer = Slicer;
})();

2
src/kiri-mode/cam/topo.js
View file

@ -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);