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

belt improvements

Browse source
This commit is contained in:
Stewart Allen 2021-01-07 22:46:16 -05:00
commit bf372eefcf
3 changed files with 41 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/mode/fdm/prepare.js
View file

@ -44,7 +44,8 @@
sliceEntry,
print = self.worker.print = KIRI.newPrint(settings, widgets),
isThin = settings.controller.lineType === "line",
isFlat = settings.controller.lineType === "flat";
isFlat = settings.controller.lineType === "flat",
isBelt = device.bedBelt;
// compute bounds if missing
if (!bounds) {
@ -63,7 +64,7 @@
// TODO pick a widget with a slice on the first layer and use that nozzle
// create brim, skirt, raft if specificed in FDM mode (code shared by laser)
if (process.outputBrimCount || process.outputRaft) {
if (!isBelt && (process.outputBrimCount || process.outputRaft)) {
let brims = [],
offset = process.outputBrimOffset || (process.outputRaft ? 4 : 0);

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

@ -74,7 +74,8 @@
fillSpacing = nozzleSize,
fillOffset = nozzleSize * fillOffsetMult,
sliceFillAngle = spro.sliceFillAngle,
view = widget.mesh && widget.mesh.newGroup ? widget.mesh.newGroup() : null;
view = widget.mesh && widget.mesh.newGroup ? widget.mesh.newGroup() : null,
isBelt = sdev.bedBelt;
isFlat = settings.controller.lineType === "flat";
isThin = !isFlat && settings.controller.lineType === "line";
@ -141,7 +142,7 @@
SLICER.sliceWidget(widget, {
height: sliceHeight,
minHeight: sliceMinHeight,
firstHeight: spro.firstSliceHeight,
firstHeight: isBelt ? 0 : spro.firstSliceHeight,
// debug: true,
// xray: 3,
// view: view
@ -203,7 +204,7 @@
doShells(slice, spro.sliceShells, firstOffset, shellOffset, fillOffset, {
vase: vaseMode,
thin: spro.detectThinWalls,
belt0: sdev.bedBelt && slice.index === 0,
belt0: isBelt && slice.index === 0,
widget: widget
});
if (solid) {
@ -365,6 +366,8 @@
* @param {Obejct} options
*/
function doShells(slice, count, offset1, offsetN, fillOffset, opt = {}) {
let shellout = 0;
slice.tops.forEach(function(top) {
let top_poly = [ top.poly ];
@ -470,12 +473,20 @@
// for diffing
top.last = last;
if (opt.belt0 && top.shells.length === 0) {
let bounds = opt.widget.bounds;
top.shells.push(BASE.newPolygon()
.setOpen()
.add(bounds.min.x - 5,0,slice.z)
.add(bounds.max.x + 5,0,slice.z));
shellout += top.shells.length;
// add anchor extrusion if missing on the first belt layer
if (opt.belt0 && top.shells.length === 0 && slice.up && slice.up.tops.length) {
for (let up of slice.up.tops) {
let bounds = up.poly.bounds,
midy = (bounds.miny + bounds.maxy) / 2;
if (top.poly.isInside(up.poly, 1)) {
top.shells.push(BASE.newPolygon()
.setOpen()
.add(bounds.minx,midy,slice.z)
.add(bounds.maxx,midy,slice.z));
}
}
}
});
};
@ -495,7 +506,7 @@
}
slice.tops.forEach(function(top) {
const lines = fillArea(top.fill_off, angle, spacing, null);
let lines = fillArea(top.fill_off, angle, spacing, null);
top.fill_lines.appendAll(lines);
});