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

fix rendering and animation of A-axis only movements in indexed mode

Browse source
This commit is contained in:
Stewart Allen 2025-02-16 17:09:22 -05:00
commit fc4003e81a
5 changed files with 43 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/kiri-mode/cam/animate2.js
View file

@ -478,20 +478,26 @@ kiri.load(() => {
if (!np || !lp) {
return renderPath(send);
}
const dx = np.x - lp.x, dy = np.y - lp.y, dz = np.z - lp.z;
const dist = Math.sqrt(dx*dx + dy*dy + dz*dz);
let dx = np.x - lp.x,
dy = np.y - lp.y,
dz = np.z - lp.z,
da = Math.abs((np.a || 0) - (lp.a || 0)),
dr = (da / 360) * (2 * Math.PI * Math.max(np.z, lp.z)),
dist = Math.sqrt(dx*dx + dy*dy + dz*dz + dr*dr);
moveDist += dist;
// skip moves that are less than grid resolution
if (moveDist < rezstep) {
// console.log('skip', moveDist, rezstep, next);
renderPath(send);
return;
}
const md = Math.max(Math.abs(dx), Math.abs(dy), Math.abs(dz));
const md = Math.max(Math.abs(dx), Math.abs(dy), Math.abs(dz), dr);
const st = Math.ceil(md / rezstep);
const mx = dx / st, my = dy / st, mz = dz / st;
const sd = Math.sqrt(mx*mx + my*my + mz*mz);
const sd = Math.sqrt(mx*mx + my*my + mz*mz + dr*dr);
const moves = [];
for (let i=0, x=lp.x, y=lp.y, z=lp.z; i<st; i++) {
moves.push({x,y,z,a:lp.a,md:sd});

2
src/kiri-mode/cam/export.js
View file

@ -389,7 +389,7 @@ CAM.export = function(print, online) {
return;
}
layer.forEach(out => {
if (out.gcode) {
if (out.gcode || out.type === 'lerp') {
return;
}
if (out.tool && out.tool !== ctool) {

35
src/kiri-mode/cam/prepare.js
View file

@ -259,7 +259,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
* @param {number} [speed] speed
* @param {number} [tool] tool
*/
function layerPush(point, emit, speed, tool) {
function layerPush(point, emit, speed, tool, type) {
const dz = (point && lastPush && lastPush.point) ? point.z - lastPush.point.z : 0;
if (dz < 0 && speed > plungeRate) {
speed = plungeRate;
@ -291,7 +291,7 @@ function prepEach(widget, settings, print, firstPoint, update) {
}
print.addOutput(layerOut, point, power, speed, tool, 'laser');
} else {
print.addOutput(layerOut, point, emit, speed, tool);
print.addOutput(layerOut, point, emit, speed, tool, type);
}
lastPush = { point, emit, speed, tool };
return point;
@ -319,11 +319,6 @@ function prepEach(widget, settings, print, firstPoint, update) {
point.y += wmy;
point.z += zadd;
// carry rotation forward when not overridden
if (point.a === undefined && lastPoint) {
point.a = lastPoint.a;
}
// console.log(point.z);
if (nextIsMove) {
cut = 0;
@ -332,6 +327,32 @@ function prepEach(widget, settings, print, firstPoint, update) {
let rate = feedRate * factor;
// carry rotation forward when not overridden
if (point.a === undefined && lastPoint) {
point.a = lastPoint.a;
} else if (lastPoint && point.a !== undefined && lastPoint.a !== undefined) {
let DA = lastPoint.a - point.a;
let MZ = Math.max(lastPoint.z, point.z)
// find arc length
let AL = (Math.abs(DA) / 360) * (2 * Math.PI * MZ);
if (AL >= 1) {
let lerp = base.util.lerp(lastPoint.a, point.a, 1);
// create interpolated point set for rendering and animation
// console.log({ DA, MZ, AL }, lerp.length);
for (let a of lerp) {
let lp = point.clone().setA(a);
// console.log(lp.a, lp.x, lp.y, lp.z);
lastPoint = layerPush(
lp,
cut ? 1 : 0,
rate,
tool,
"lerp"
);
}
}
}
// before first point, move cutting head to point above it
// then set that new point as the lastPoint
if (!lastPoint) {