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

partial sla slice render restore

Browse source
This commit is contained in:
Stewart Allen 2020-11-08 18:39:21 -05:00
commit 1c5c8e9cb4
10 changed files with 170 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/mode/cam/driver.js
View file

@ -9,7 +9,7 @@
// init, // src/mode/cam/client.js
// slice, // src/mode/cam/slice.js
// prepare, // src/mode/cam/prepare.js
// printExport, // src/mode/cam/export.js
// export // src/mode/cam/export.js
},
CPRO = CAM.process = {
LEVEL: 1,

2
src/mode/fdm/driver.js
View file

@ -13,7 +13,7 @@
// init, // src/mode/fdm/client.js
// slice, // src/mode/fdm/slice.js
// prepare, // src/mode/fdm/prepare.js
// printExport, // src/mode/fdm/export.js
// export, // src/mode/fdm/export.js
fixExtruders
};

15
src/mode/fdm/slice.js
View file

@ -479,6 +479,15 @@
// console.log(slice.index, slice.render.stats);
}
// shared with SLA driver
FDM.share = {
doShells,
doDiff,
projectFlats,
projectBridges,
doSolidsFill
};
/**
* Compute offset shell polygons. For FDM, the first offset is usually half
* of the nozzle width. Each subsequent offset is a full nozzle width. User
@ -789,11 +798,11 @@
* Used to calculate bridges, flats and then solid projections.
* 'expand' is used for top offsets in SLA mode
*/
function doDiff(slice, minArea, sla) {
function doDiff(slice, minArea, sla, fakedown) {
const top = slice,
down = slice.down,
down = slice.down || (fakedown ? newSlice(-1) : null),
topInner = sla ? top.topPolys() : top.topInners(),
downInner = sla ? down.downPolys() : down.topInners(),
downInner = sla ? down.topPolys() : down.topInners(),
bridges = top.bridges = [],
flats = down.flats = [];

4
src/mode/sla/driver.js
View file

@ -10,11 +10,9 @@
const KIRI = self.kiri,
SLA = KIRI.driver.SLA = {
// init, // src/mode/sla/client.js
// printRender // src/mode/sla/client.js
// sliceRender, // src/mode/sla/client.js
// slice, // src/mode/sla/slice.js
printSetup,
// printExport, // src/mode/sla/export.js
// export, // src/mode/sla/export.js
// printDownload, // src/mode/sla/client.js
legacy: false
};

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

@ -8,6 +8,7 @@
BASE = self.base,
UTIL = BASE.util,
SLA = KIRI.driver.SLA,
FDM = KIRI.driver.FDM.share,
SLICER = KIRI.slicer,
newTop = KIRI.newTop,
newSlice = KIRI.newSlice,
@ -120,12 +121,12 @@
slices[i].down = slices[i-1];
}
// reset for solids and support projections
slices.forEach(function(slice) {
slice.invalidateFill();
slice.invalidateSolids();
slice.invalidateSupports();
slice.isSolidFill = false;
});
// slices.forEach(function(slice) {
// slice.invalidateFill();
// slice.invalidateSolids();
// slice.invalidateSupports();
// slice.isSolidFill = false;
// });
let solidLayers = Math.round(process.slaShell / process.slaSlice);
work_total = [
5, // shell
@ -139,34 +140,34 @@
work_remain = work_total;
forSlices(slices, 5, (slice,index) => {
if (process.slaShell) {
slice.doShells(2, 0, process.slaShell);
FDM.doShells(slice, 2, 0, process.slaShell);
} else {
slice.doShells(1, 0);
FDM.doShells(slice, 1, 0);
}
}, "slice");
forSlices(slices, 10, (slice) => {
if (slice.synth) return;
slice.doDiff(0.000001, 0.005, !process.slaOpenBase);
FDM.doDiff(slice, 0.000001, 0.005, true, !process.slaOpenBase);
}, "delta");
if (solidLayers) {
forSlices(slices, 10, (slice) => {
if (slice.synth) return;
slice.projectFlats(solidLayers);
slice.projectBridges(solidLayers);
FDM.projectFlats(slice, solidLayers);
FDM.projectBridges(slice, solidLayers);
}, "project");
forSlices(slices, 10, (slice) => {
if (slice.synth) return;
slice.doSolidsFill(undefined, undefined, 0.001);
let traces = POLY.nest(POLY.flatten(slice.gatherTraces([])));
let trims = slice.solids.trimmed || [];
FDM.doSolidsFill(slice, undefined, undefined, 0.001);
let traces = POLY.nest(POLY.flatten(slice.topShells()));
let trims = slice.solids || [];
traces.appendAll(trims);
let union = POLY.union(traces);
slice.solids.unioned = union;
slice.unioned = union;
}, "solid");
} else {
forSlices(slices, 10, (slice) => {
if (slice.synth) return;
slice.solids.unioned = slice.gatherTopPolys([]);
slice.unioned = slice.topPolys();
}, "solid");
}
if (process.slaFillDensity && process.slaShell) {
@ -181,12 +182,46 @@
doupdate(100 * progress, "support");
});
}
doRender(widget);
ondone();
}, function(update) {
return onupdate(0.0 + update * 0.25);
});
};
function doRender(widget) {
widget.slices.forEach(slice => {
const render = slice.output();
if (slice.unioned) {
// console.log('solid', slice.index)
slice.unioned.forEach(poly => {
poly = poly.clone(true);//.move(widget.track.pos);
render
.setLayer("layers", { line: 0x010101, face: 0x0099cc, opacity: 0.2 })
.addAreas([poly], { outline: true });
});
} else if (slice.tops) {
// console.log('top', slice.index)
slice.tops.forEach(top => {
let poly = top.poly;//.clone(true).move(widget.track.pos);
render
.setLayer("layers", { line: 0x010101, face: 0xfcba03, opacity: 0.2 })
.addAreas([poly], { outline: true });
});
}
if (slice.supports) {
// console.log('support', slice.index)
slice.supports.forEach(poly => {
render
.setLayer("support", { line: 0x010101, face: 0xfcba03, opacity: 0.2 })
.addAreas([poly], { outline: true });
});
}
});
}
function computeSupports(widget, process, progress) {
let area = widget.union.reduce((t,p) => { return t + p.areaDeep() }, 0),
perim = widget.union.reduce((t,p) => { return t + p.perimeter() }, 0),
@ -199,7 +234,7 @@
// compute total "mass" by slice
ops.forEach(slice => {
slice.mass = slice.solids.unioned.reduce((t,p) => { return t + p.areaDeep() }, 0);
slice.mass = slice.unioned.reduce((t,p) => { return t + p.areaDeep() }, 0);
if (slice.up && slice.up.bridges) {
slice.bear = slice.up.bridges.reduce((t,p) => { return t + p.areaDeep() }, 0);
slice.bear_up = slice.up.bridges;
@ -499,7 +534,7 @@
function fillPolys(slice, settings) {
let process = settings.process,
device = settings.device,
polys = slice.solids.unioned,
polys = slice.unioned,
bounds = settings.bounds,
width = bounds.max.x - bounds.min.x,
depth = bounds.max.y - bounds.min.y,
@ -550,9 +585,9 @@
}
fill = POLY.trimTo(fill, slice.tops.map(t => t.poly));
fill = POLY.union(slice.solids.unioned.appendAll(fill));
fill = POLY.union(slice.unioned.appendAll(fill));
slice.solids.unioned = fill;
slice.unioned = fill;
}
function pixAt(png,x,y) {