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

fixes #72 Z safe distance lifts with multiple objects

Browse source
This commit is contained in:
Stewart Allen 2020-03-22 21:28:17 -04:00
commit 6c4a81e679
3 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
js/kiri-driver-cam.js
View file

@ -1252,9 +1252,12 @@ var gs_kiri_cam = exports;
}
function camOut(point, cut) {
let wmx = widget.mesh.position.x;
let wmy = widget.mesh.position.y;
point = point.clone();
point.x += widget.mesh.position.x;
point.y += widget.mesh.position.y;
point.x += wmx;
point.y += wmy;
point.z += zadd;
if (nextIsMove) {
@ -1270,7 +1273,7 @@ var gs_kiri_cam = exports;
isMove = !cut;
// drop points too close together
if (deltaXY < 0.001 && point.z === lastPoint.z) {
// console.trace(["drop dup",lastPoint,point]);
console.trace(["drop dup",lastPoint,point]);
return;
}
if (isMove && deltaXY <= toolDiamMove) {
@ -1291,10 +1294,10 @@ var gs_kiri_cam = exports;
getTopoZPathMax(
widget,
toolProfile,
lastPoint.x,
lastPoint.y,
point.x,
point.y) + zadd,
lastPoint.x - wmx,
lastPoint.y - wmy,
point.x - wmx,
point.y - wmy) + zadd,
point.z,
lastPoint.z) : zmax,
mustGoUp = MAX(maxz - point.z, maxz - lastPoint.z) >= tolerance,