make bottom clear configurable
This commit is contained in:
parent
1fa00bc323
commit
edf0a8ceb8
5 changed files with 24 additions and 20 deletions
|
|
@ -525,15 +525,16 @@ export function createPopOps() {
|
|||
|
||||
createPopOp('helical', {
|
||||
tool: 'camHelicalTool',
|
||||
offset: 'camHelicalOffset',
|
||||
spindle: 'camHelicalSpindle',
|
||||
rate: 'camHelicalDownSpeed',
|
||||
feed: 'camHelicalSpeed',
|
||||
down: 'camHelicalDown',
|
||||
thru: 'camHelicalThru',
|
||||
offset: 'camHelicalOffset',
|
||||
forceStartAng:'camHelicalForceStartAngle',
|
||||
finish: 'camHelicalBottomFinish',
|
||||
startAng:'camHelicalStartAngle',
|
||||
offOver: 'camHelicalOffsetOverride',
|
||||
thru: 'camHelicalThru',
|
||||
forceStartAng:'camHelicalForceStartAngle',
|
||||
fromTop: 'camHelicalFromStockTop',
|
||||
}).inputs = {
|
||||
tool: UC.newSelect(LANG.cc_tool, {}, "tools"),
|
||||
|
|
@ -546,7 +547,8 @@ export function createPopOps() {
|
|||
startAng: UC.newInput(LANG.ch_stra_s, {title:LANG.ch_stra_l, convert:UC.toDegsFloat, bound:UC.bound(-360,360),show:() => env.poppedRec.forceStartAng}),
|
||||
offOver: UC.newInput(LANG.cc_offd_s, {title:LANG.cc_offd_l, convert:UC.toFloat, units:true, bound:UC.bound(0,Infinity)}),
|
||||
sep: UC.newBlank({class:"pop-sep"}),
|
||||
forceStartAng: UC.newBoolean(LANG.ch_fsta_s, undefined, {title:LANG.ch_fsta_l, }),
|
||||
finish: UC.newBoolean(LANG.ch_fini_s,undefined, { title:LANG.ch_fini_l }),
|
||||
forceStartAng: UC.newBoolean(LANG.ch_fsta_s, undefined, {title:LANG.ch_fsta_l }),
|
||||
fromTop: UC.newBoolean(LANG.cd_ftop_s,undefined, {title:LANG.cd_ftop_l}),
|
||||
sep: UC.newBlank({class:"pop-sep"}),
|
||||
thru: UC.newInput(LANG.cd_thru_s, {title:LANG.cd_thru_l, convert:UC.toFloat, units:true}),
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ export class OpHelical extends CamOp {
|
|||
offset,
|
||||
down,
|
||||
thru,
|
||||
finish,
|
||||
} = op;
|
||||
let {stock} = settings
|
||||
|
||||
|
|
@ -139,22 +140,19 @@ export class OpHelical extends CamOp {
|
|||
})
|
||||
);
|
||||
|
||||
// poly.addPoints([
|
||||
// newPoint(0,0,0)
|
||||
// ])
|
||||
|
||||
//do a full circle at the bottom
|
||||
poly.addPoints(
|
||||
arcToPath(finalEnd, finalEnd, numSegs, {
|
||||
clockwise,
|
||||
radius,
|
||||
center,
|
||||
}),
|
||||
);
|
||||
|
||||
poly.append(
|
||||
finalEnd.clone().setZ(zBottom),
|
||||
)
|
||||
//if settings dictate, do a full circle at the bottom
|
||||
if(finish){
|
||||
poly.addPoints(
|
||||
arcToPath(finalEnd, finalEnd, numSegs, {
|
||||
clockwise,
|
||||
radius,
|
||||
center,
|
||||
}),
|
||||
);
|
||||
poly.append(
|
||||
finalEnd.clone().setZ(zBottom),
|
||||
)
|
||||
}
|
||||
break;
|
||||
}
|
||||
currentZ = bottom;
|
||||
|
|
|
|||
Loading…
Reference in a new issue