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

first-pass at multi-z arc prepare

Browse source
This commit is contained in:
bakedpotatolord 2025-07-13 22:28:37 -06:00
commit 4b52642cbe
1 changed files with 40 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/kiri/mode/cam/prepare.js
View file

@ -330,7 +330,7 @@ export function prepEach(widget, settings, print, firstPoint, update) {
* @param {number} opts.factor speed scale factor * @param {number} opts.factor speed scale factor
*/ */
function camOut(point, emit, opts) { function camOut(point, emit, opts) {
// console.log({point, emit, opts}) // console.trace({point, emit, opts})
let { let {
center = {}, center = {},
clockwise = true, clockwise = true,
@ -730,7 +730,8 @@ export function prepEach(widget, settings, print, firstPoint, update) {
function polyEmit(poly, index, count, fromPoint) { function polyEmit(poly, index, count, fromPoint) {
let arcQ = [], let arcQ = [],
arcMax = Infinity, // no max arc radius arcMax = Infinity, // no max arc radius
lineTolerance = 0.001; // do not consider points under 0.001mm for arcs lineTolerance = 0.001, // do not consider points under 0.001mm for arcs
zTolerance = 0.1; // allow zs of Points to be off by 0.001mm per radian of rotation
fromPoint = fromPoint || printPoint; fromPoint = fromPoint || printPoint;
arcQ.angle = [] arcQ.angle = []
@ -802,10 +803,20 @@ export function prepEach(widget, settings, print, firstPoint, update) {
let angle = 2 * Math.asin(dist / (2 * lr.r)); let angle = 2 * Math.asin(dist / (2 * lr.r));
radFault = Math.abs(angle) > arcRes; // enforce arcRes(olution) radFault = Math.abs(angle) > arcRes; // enforce arcRes(olution)
} else { } else {
// console.log("too much angle") console.log("too much angle")
radFault = true; radFault = true;
} }
let endDelta = e1.distTo2D(e3)
if(endDelta < 0.1){
console.log("circleCompleteFault")
drainQ(true)
return e3
}
let ddz = Math.abs((e3.z - e4.z) - (e4.z - e5.z)) // take second derivitive of z
let zFault = Math.abs(ddz) > zTolerance
if (cc) { if (cc) {
if ([cc.x, cc.y, cc.z, cc.r].hasNaN()) { if ([cc.x, cc.y, cc.z, cc.r].hasNaN()) {
// console.log({cc, e1, e2, e3}); // console.log({cc, e1, e2, e3});
@ -820,12 +831,13 @@ export function prepEach(widget, settings, print, firstPoint, update) {
let a = toRadians(arcQ[0].slopeTo(cc).angle) let a = toRadians(arcQ[0].slopeTo(cc).angle)
let b = toRadians(arcQ[1].slopeTo(cc).angle) let b = toRadians(arcQ[1].slopeTo(cc).angle)
let angle = Math.abs(b - a) let angle = Math.abs(b - a)
radFault = Math.abs(angle) > arcRes
if (Math.abs(angle) > arcRes) { if (radFault) {
// if so, remove first point // if so, remove first point
console.log("secondary radfault")
camOut(arcQ.shift(), 1) camOut(arcQ.shift(), 1)
radFault = true
} }
} else { } else {
// check center point delta // check center point delta
arcQ.xSum = arcQ.center.reduce(function (t, v) { return t + v.x }, 0); arcQ.xSum = arcQ.center.reduce(function (t, v) { return t + v.x }, 0);
@ -836,10 +848,10 @@ export function prepEach(widget, settings, print, firstPoint, update) {
dc = Math.hypot(dx, dy); // delta center distance dc = Math.hypot(dx, dy); // delta center distance
} }
// if new point is off the arc // if new point is off the arc
// if (deem || depm || desp || dc > arcTolerance || cc.r < arcMin || cc.r > arcMax || dist > cc.r) { // if point is off-center, or too far from center, or too large of a radius
if (dc * arcQ.center.length / arcQ.rSum > arcTolerance || dist > cc.r || cc.r > arcMax || radFault) { if (dc * arcQ.center.length / arcQ.rSum > arcTolerance || dist > cc.r || cc.r > arcMax || radFault || zFault) {
// let debug = [deem, depm, desp, dc * arcQ.center.length / arcQ.rSum > arcTolerance, dist > cc.r, cc.r > arcMax, radFault]; // let debug = [ dc * arcQ.center.length / arcQ.rSum > arcTolerance, dist > cc.r, cc.r > arcMax, radFault];
// console.log("point off the arc,",structuredClone(arcQ),); console.log("point off the arc,",structuredClone(arcQ),radFault,zFault,[dc * arcQ.center.length / arcQ.rSum > arcTolerance , dist > cc.r , cc.r > arcMax]);
if (arcQ.length === 4) { if (arcQ.length === 4) {
// not enough points for an arc, drop first point and recalc center // not enough points for an arc, drop first point and recalc center
camOut(arcQ.shift(), 1); camOut(arcQ.shift(), 1);
@ -887,7 +899,12 @@ export function prepEach(widget, settings, print, firstPoint, update) {
return point; return point;
} }
function drainQ() { /**
* Emits arcs and/or lines from the arcQ to the current point set.
* @param {boolean} forceCircle emits a single circle iven if poly is not closed.
*/
function drainQ(forceCircle = false) {
console.trace("draining")
let arcPreviewRes = 64 let arcPreviewRes = 64
if (!arcTolerance) { if (!arcTolerance) {
@ -903,6 +920,7 @@ export function prepEach(widget, settings, print, firstPoint, update) {
let from = arcQ[0]; let from = arcQ[0];
let to = arcQ.peek(); let to = arcQ.peek();
let delta = from.distTo2D(to) let delta = from.distTo2D(to)
let closed = poly.isClosed()
arcQ.xSum = arcQ.center.reduce((t, v) => t + v.x, 0); arcQ.xSum = arcQ.center.reduce((t, v) => t + v.x, 0);
arcQ.ySum = arcQ.center.reduce((t, v) => t + v.y, 0); arcQ.ySum = arcQ.center.reduce((t, v) => t + v.y, 0);
arcQ.rSum = arcQ.center.reduce((t, v) => t + v.r, 0); arcQ.rSum = arcQ.center.reduce((t, v) => t + v.r, 0);
@ -913,20 +931,25 @@ export function prepEach(widget, settings, print, firstPoint, update) {
) )
// console.log("draining") // console.log("draining")
if (arcQ.length == poly.points.length) { if (closed && arcQ.length == poly.points.length || forceCircle ) {
//if is a circle //if is a circle
// generate circle // generate circle
// console.log("circle",{from, to,center}); // console.log("circle",{from, to,center});
let arcPoints = arcToPath(from, from, arcPreviewRes, { clockwise, center }) to = forceCircle? from.clone().setZ(to.z) : from
.map(applyWidgetMovement);
let arcPoints = arcToPath(from, to, arcPreviewRes, { clockwise, center })
.map(applyWidgetMovement);
console.log({arcPoints})
camOut(from, 1); camOut(from, 1);
camOut(from, gc, { center: center.sub(from), clockwise, arcPoints }); camOut(to, gc, { center: center.sub(from), clockwise, arcPoints });
// lastPoint = to.clone();
} else { } else {
//if a non-circle arc //if a non-circle arc
let arcPoints = arcToPath(from, to, arcPreviewRes, { clockwise, center }) let arcPoints = arcToPath(from, to, arcPreviewRes, { clockwise, center })
.map(applyWidgetMovement); .map(applyWidgetMovement);
// console.log("arc") console.log("arc")
// first arc point // first arc point
camOut(from, 1); camOut(from, 1);
// rest of arc to final point // rest of arc to final point