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

start adding threading to SLA

Browse source
This commit is contained in:
Stewart Allen 2021-06-24 18:15:51 -04:00
commit 11225739e5
4 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/geo/polygons.js
View file

@ -29,6 +29,7 @@
trimTo,
expand,
expand_lines,
points,
route,
union,
inset,
@ -145,6 +146,10 @@
return output;
}
function points(polys) {
return polys.length ? polys.map(p => p.deepLength).reduce((a,v) => a+v) : 0;
}
/**
* todo use clipper polytree?
*

2
src/kiri/init.js
View file

@ -1643,7 +1643,7 @@
detail: UC.newSelect(LANG.pt_qual_s, {title: LANG.pt_qual_l, action: detailSave}, "detail"),
decimate: UC.newBoolean(LANG.pt_deci_s, booleanSave, {title: LANG.pt_deci_l}),
healMesh: UC.newBoolean(LANG.pt_heal_s, booleanSave, {title: LANG.pt_heal_l}),
threaded: UC.newBoolean(LANG.pt_thrd_s, booleanSave, {title: LANG.pt_thrd_l, modes:FDM}),
threaded: UC.newBoolean(LANG.pt_thrd_s, booleanSave, {title: LANG.pt_thrd_l, modes:FDM_SLA}),
prefadd: UC.checkpoint($('prefs-add')),

6
src/kiri/worker.js
View file

@ -54,8 +54,8 @@ KIRI.minions = {
union: function(polys, minarea) {
return new Promise((resolve, reject) => {
if (concurrent < 2 || polys.length * 2 < concurrent) {
resolve(POLY.union(polys, 0, true));
if (concurrent < 2 || polys.length < concurrent * 2 || POLY.points(polys) < concurrent * 50) {
resolve(POLY.union(polys, minarea, true));
return;
}
let polyper = Math.ceil(polys.length / concurrent);
@ -65,7 +65,7 @@ KIRI.minions = {
let polys = KIRI.codec.decode(data.union);
union.appendAll(polys);
if (--running === 0) {
resolve(POLY.union(union, 0, true));
resolve(POLY.union(union, minarea, true));
}
};
for (let i=0; i<polys.length; i += polyper) {

37
src/mode/sla/slice.js
View file

@ -11,6 +11,7 @@
SLA = KIRI.driver.SLA,
FDM = KIRI.driver.FDM.share,
SLICER = KIRI.slicer,
tracker = UTIL.pwait,
newTop = KIRI.newTop,
newSlice = KIRI.newSlice,
newPoint = BASE.newPoint,
@ -26,8 +27,8 @@
* @param {Function} ondone (called when complete with an array of Slice objects)
*/
SLA.slice = function(settings, widget, onupdate, ondone) {
let process = settings.process,
device = settings.device,
let { process, device, controller } = settings,
isConcurrent = controller.threaded && KIRI.minions.concurrent,
work_total,
work_remain;
@ -59,10 +60,7 @@
});
let height = process.slaSlice || 0.05;
SLICER.sliceWidget(widget, {
height: height,
add: !process.slaOpenTop
}, function(slices) {
async function onSliceDone(slices) {
// hold onto last (empty) slice
let last = slices[slices.length-1];
// remove empty slices
@ -143,7 +141,7 @@
} else {
FDM.doShells(slice, 1, 0);
}
}, "slice");
}, "shells");
forSlices(slices, 10, (slice) => {
if (slice.synth) return;
FDM.doDiff(slice, 0.000001, true, !process.slaOpenBase);
@ -154,14 +152,22 @@
FDM.projectFlats(slice, solidLayers);
FDM.projectBridges(slice, solidLayers);
}, "project");
forSlices(slices, 10, (slice) => {
async function doUnionSolid(slice) {
if (slice.synth) return;
let traces = POLY.nest(POLY.flatten(slice.topShells()));
if (slice.solids) {
let trims = slice.solids || [];
traces.appendAll(trims);
let union = POLY.union(traces, undefined, true);
slice.unioned = POLY.setZ(union, slice.z);
}, "solid");
// slice.unioned = POLY.setZ(POLY.union(traces, undefined, true), slice.z);
slice.unioned = POLY.setZ(await KIRI.minions.union(traces), slice.z);
} else {
slice.unioned = traces;
}
}
let promises = slices.map(slice => doUnionSolid(slice));
await tracker(promises, (i, t) => {
doupdate(10 / promises.length, "solid");
});
} else {
forSlices(slices, 10, (slice) => {
if (slice.synth) return;
@ -181,7 +187,14 @@
});
}
doRender(widget);
ondone();
}
SLICER.sliceWidget(widget, {
height: height,
add: !process.slaOpenTop,
concurrent: isConcurrent
}, function(slices) {
onSliceDone(slices).then(ondone);
}, function(update) {
return onupdate(0.0 + update * 0.25);
});