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

refactor cam stock visualization

Browse source
This commit is contained in:
Stewart Allen 2020-11-14 11:12:12 -05:00
commit 8a1118d6c1
12 changed files with 253 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/mode/cam/prepare.js
View file

@ -55,14 +55,14 @@
outer = settings.bounds,
outerz = outer.max.z,
slices = widget.slices,
bounds = widget.getCamBounds(settings),
boundsz = bounds.max.z,
hasStock = process.camStockOffset || (process.camStockZ && process.camStockX && process.camStockY),
hasStock = stock.x && stock.y && stock.z && process.camStockOn,
startCenter = process.outputOriginCenter,
alignTop = settings.controller.alignTop,
zclear = (process.camZClearance || 1),
zmax_outer = hasStock ? stock.z + zclear : outerz + zclear,
ztOff = process.camZTopOffset,
ztOff = hasStock ? process.camZTopOffset : 0,
bounds = widget.getBoundingBox(),
boundsz = bounds.max.z + ztOff,
zadd = hasStock ? stock.z - boundsz : alignTop ? outerz - boundsz : 0,
zmax = outerz + zclear,
wmpos = widget.mesh.position,
@ -247,8 +247,8 @@
deltaXY = 0;
}
} //else (TODO verify no else here b/c above could change isMove)
// move over things
if ((deltaXY > toolDiam || (deltaZ > toolDiam && deltaXY > tolerance)) && (isMove || absDeltaZ >= tolerance)) {
// move over things ... try checking path clearance tests for *every* move
if ((deltaXY > toolDiam || (deltaZ > tolerance && deltaXY > tolerance)) && (isMove || absDeltaZ >= tolerance)) {
let maxz = getZClearPath(
terrain,
lastPoint.x,// - wmx,