stock is now always on in CAM mode
This commit is contained in:
parent
8580307661
commit
6c67c93988
10 changed files with 40 additions and 50 deletions
|
|
@ -68,24 +68,23 @@ function prepEach(widget, settings, print, firstPoint, update) {
|
|||
outer = settings.bounds || widget.getPositionBox(),
|
||||
outerz = outer.max.z,
|
||||
slices = widget.slices,
|
||||
hasStock = stock.x && stock.y && stock.z && process.camStockOn,
|
||||
isIndexed = hasStock && process.camStockIndexed,
|
||||
isIndexed = process.camStockIndexed,
|
||||
startCenter = process.camOriginCenter,
|
||||
alignTop = settings.controller.alignTop,
|
||||
zclear = (process.camZClearance || 1),
|
||||
zmax_force = process.camForceZMax || false,
|
||||
zmax_outer = hasStock ? stock.z + zclear : outerz + zclear,
|
||||
zmax_outer = stock.z + zclear,
|
||||
wztop = widget.track.top,
|
||||
ztOff = hasStock ? stock.z - wztop : 0,
|
||||
ztOff = stock.z - wztop,
|
||||
bounds = widget.getBoundingBox(),
|
||||
boundsz = bounds.max.z + ztOff,
|
||||
zadd = hasStock && !isIndexed ? stock.z - boundsz : alignTop ? outerz - boundsz : 0,
|
||||
zadd = !isIndexed ? stock.z - boundsz : alignTop ? outerz - boundsz : 0,
|
||||
zmax = outerz + zclear + process.camOriginOffZ,
|
||||
wmpos = widget.track.pos,
|
||||
wmx = wmpos.x,
|
||||
wmy = wmpos.y,
|
||||
originx = (startCenter ? 0 : hasStock ? -stock.x / 2 : bounds.min.x) + process.camOriginOffX,
|
||||
originy = (startCenter ? 0 : hasStock ? -stock.y / 2 : bounds.min.y) + process.camOriginOffY,
|
||||
originx = (startCenter ? 0 : -stock.x / 2) + process.camOriginOffX,
|
||||
originy = (startCenter ? 0 : -stock.y / 2) + process.camOriginOffY,
|
||||
origin = newPoint(originx + wmx, originy + wmy, zmax),
|
||||
output = print.output,
|
||||
easeDown = process.camEaseDown,
|
||||
|
|
|
|||
Loading…
Reference in a new issue