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 shell generation into slice (new) post-processor which means it can be distributed and co-located with slicing in minion

Browse source
This commit is contained in:
Stewart Allen 2021-06-23 22:31:27 -04:00
commit e2ef4ff7e2
10 changed files with 246 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/kiri/minion.js
View file

@ -92,10 +92,10 @@ const funcs = {
realp[p++] = BASE.newPoint(points[i++], points[i++], points[i++]);
}
let output = [];
for (let slice of slices) {
for (let params of slices) {
output.push({
slice,
tops: KIRI.slicer.sliceZ(slice.z, realp, options).tops
params,
data: { tops: KIRI.slicer.sliceZ(params.z, realp, options, params).tops }
});
}
reply({ seq, output: CODEC.encode(output) });

18
src/kiri/slice.js
View file

@ -176,9 +176,21 @@
}
PRO.addTop = function(poly) {
let top = new Top(poly);
this.tops.push(top);
return top;
if (poly.length) {
let top = new Top(poly);
this.tops.push(top);
return top;
} else {
let top = new Top(poly.poly);
top.fill_lines = poly.fill_lines;
top.fill_off = poly.fill_off;
top.last = poly.last;
top.shells = poly.shells;
this.tops.push(top);
return top;
}
console.log('top', poly);
throw "invalid top";
};
PRO.findClosestPointTo = function(target) {

109
src/kiri/slicer.js
View file

@ -2,6 +2,9 @@
"use strict";
/**
* Slicing engine used by FDM, Laser, and SLA
*/
(function() {
if (self.kiri.slicer) return;
@ -10,7 +13,8 @@
slice,
sliceZ,
sliceWidget,
connectLines
connectLines,
createSlice
};
let KIRI = self.kiri,
@ -138,8 +142,8 @@
if (concurrent > 1) {
if (bucketCount < concurrent) {
bucketCount = concurrent;
} else if (bucketCount > 128) {
bucketCount = 128;
} else if (bucketCount > 100) {
bucketCount = 100;
}
}
@ -302,42 +306,65 @@
function bucketZ(index, z, height, thick) {
buckets[Math.floor(z * zScale)].slices.push({
index, z, height, thick
index, z, height, thick, total: zIndexes.length
});
}
async function sliceBuckets() {
let output = [];
// console.log({buckets});
if (concurrent < 2) {
sliceBucketsLocal(buckets, output);
} else {
let promises = [];
for (let bucket of buckets) {
promises.push(KIRI.minions.sliceBucket(bucket, options, output));
}
await tracker(promises, (i,t) => {
if (concurrent) {
let promises = buckets.map(
bucket => KIRI.minions.sliceBucket(bucket, options, output)
);
await tracker(promises, (i,t,d) => {
onupdate(0.1 + (i / t) * 0.9);
});
} else {
let count = 0;
for (let bucket of buckets) {
for (let params of bucket.slices) {
output.push(createSlice(
params,
sliceZ(params.z, bucket.points, options, params),
options
));
onupdate(0.1 + (count++ / zIndexes.length) * 0.9);
}
}
}
return output;
}
function sliceBucketsLocal(buckets, output) {
let count = 0;
for (let bucket of buckets) {
for (let slice of bucket.slices) {
let { index, z, height, thick } = slice;
let { lines, groups, tops } = sliceZ(z, bucket.points, options);
slice = newSlice(z).addTops(tops);
slice.height = height;
slice.index = index;
slice.thick = thick;
output.push(slice);
onupdate(0.1 + (count++ / zIndexes.length) * 0.9);
}
}
function createSlice(params, data, options = {}) {
let { index, z, height, thick } = params;
let { lines, groups, tops } = data;
let slice = newSlice(z).addTops(tops);
slice.height = height;
slice.index = index;
slice.thick = thick;
// debugging (non-threaded mode only)
let { debug, xray, view } = options;
if (view && (debug || xray)) {
if ((debug && lines.excessive) || xray) {
const dash = xray || 3;
lines.forEach((line, i) => {
const group = i % dash;
const color = [ 0xff0000, 0x00ff00, 0x0000ff, 0xffff00, 0xff00ff ][group];
slice.output().setLayer(`xl-${group}`, color).addLine(line.p1, line.p2);
});
}
POLY.nest(groups).forEach((poly, i) => {
slice.addTop(poly);
if (xray) {
const group = i % (xray || 3);
const color = [ 0xff0000, 0x00ff00, 0x0000ff, 0xffff00, 0xff00ff ][group];
slice.output().setLayer(`xg-${group}`, color).addPoly(poly);
}
});
}
return slice;
}
/** ***** SLICING FUNCTIONS ***** */
@ -421,7 +448,7 @@
* @param {number} z
* @param {number} [height] optional real height (fdm)
*/
function sliceZ(z, points, options = {}) {
function sliceZ(z, points, options = {}, params = {}) {
let phash = {},
lines = [],
p1, p2, p3;
@ -477,28 +504,18 @@
groups = POLY.flatten(POLY.union(POLY.nest(groups), null, true), null, true);
}
// if ((debug && lines.excessive) || xray) {
// const dash = xray || 3;
// lines.forEach((line, i) => {
// const group = i % dash;
// const color = [ 0xff0000, 0x00ff00, 0x0000ff, 0xffff00, 0xff00ff ][group];
// slice.output().setLayer(`xl-${group}`, color).addLine(line.p1, line.p2);
// });
// }
let tops = POLY.nest(groups);
let data = { lines, groups, tops };
// identify and add tops to slice
// POLY.nest(groups).forEach((poly, i) => {
// slice.addTop(poly);
// if (xray) {
// const group = i % (xray || 3);
// const color = [ 0xff0000, 0x00ff00, 0x0000ff, 0xffff00, 0xff00ff ][group];
// slice.output().setLayer(`xg-${group}`, color).addPoly(poly);
// }
// });
// look for driver-specific slice post-processor
if (options.mode) {
let fn = KIRI.driver[options.mode].slicePost;
if (fn) {
fn(data, options, params);
}
}
return { lines, groups, tops };
return data;
}
/**

3
src/kiri/slicer2.js
View file

@ -2,6 +2,9 @@
"use strict";
/**
* Slicing engine used by CAM
*/
(function() {
let KIRI = self.kiri,

14
src/kiri/worker.js
View file

@ -145,16 +145,12 @@ KIRI.minions = {
slices,
options
}, data => {
for (let rec of KIRI.codec.decode(data.output)) {
let { slice, tops } = rec;
let newSlice = KIRI.newSlice(slice.z);
newSlice.index = slice.index;
newSlice.thick = slice.thick;
newSlice.height = slice.height;
newSlice.addTops(tops);
output.push(newSlice);
let recs = KIRI.codec.decode(data.output);
for (let rec of recs) {
let { params, data } = rec;
output.push(KIRI.slicer.createSlice(params, data));
}
resolve();
resolve(recs);
}, [ floatP.buffer ]);
});
},