fix order of operations bug with tabs and inner only
This commit is contained in:
parent
8fa38ef3b4
commit
d01f4a1300
1 changed files with 8 additions and 8 deletions
|
|
@ -181,6 +181,12 @@ class OpArea extends CamOp {
|
|||
// terminate z descent when no further output possible
|
||||
break outer;
|
||||
}
|
||||
// support legacy outline features
|
||||
if (op.omitouter) {
|
||||
outs = omitOuter(outs);
|
||||
} else if (op.omitinner) {
|
||||
outs = omitInner(outs);
|
||||
}
|
||||
// cut tabs when present
|
||||
if (tabs.length) outs = cutTabs(tabs, outs);
|
||||
// for roughing backward compatability
|
||||
|
|
@ -189,12 +195,6 @@ class OpArea extends CamOp {
|
|||
for (let p of out.points)
|
||||
p.z += op.leave_z;
|
||||
}
|
||||
// support legacy outline features
|
||||
if (op.omitouter) {
|
||||
outs = omitOuter(outs);
|
||||
} else if (op.omitinner) {
|
||||
outs = omitInner(outs);
|
||||
}
|
||||
// add tabs to travel boundaries
|
||||
if (tabs.length) {
|
||||
let tab_shadows = tabs.filter(t => t.top >= z).map(t => t.poly);
|
||||
|
|
@ -259,14 +259,14 @@ class OpArea extends CamOp {
|
|||
}
|
||||
// add dogbones when specified
|
||||
if (op.dogbones) outs.forEach(out => out.addDogbones(toolDiam / 5, op.revbones));
|
||||
// cut tabs when present
|
||||
if (tabs.length) outs = cutTabs(tabs, outs);
|
||||
// support legacy outline features
|
||||
if (op.omitouter) {
|
||||
outs = omitOuter(outs);
|
||||
} else if (op.omitinner) {
|
||||
outs = omitInner(outs);
|
||||
}
|
||||
// cut tabs when present
|
||||
if (tabs.length) outs = cutTabs(tabs, outs);
|
||||
slice.camLines = outs;
|
||||
POLY.setWinding(outs, direction === 'climb');
|
||||
// store travel boundary that triggers up and over moves
|
||||
|
|
|
|||
Loading…
Reference in a new issue