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 displayed animation coordinates to line up with exported gcode

Browse source
This commit is contained in:
Stewart Allen 2021-09-01 13:50:28 -04:00
commit 655b92e2a0
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app.js
View file

@ -72,7 +72,6 @@ function init(mod) {
])); ]));
mod.add(fixedmap("/api/", api)); mod.add(fixedmap("/api/", api));
if (debug) { if (debug) {
mod.static("/src/", "src");
mod.static("/mod/", "mod"); mod.static("/mod/", "mod");
mod.sync("/reload", () => { mod.sync("/reload", () => {
mod.reload(); mod.reload();
@ -80,6 +79,7 @@ function init(mod) {
}); });
} }
mod.add(rewriteHtmlVersion); mod.add(rewriteHtmlVersion);
mod.static("/src/", "src");
mod.static("/obj/", "web/obj"); mod.static("/obj/", "web/obj");
mod.static("/moto/", "web/moto"); mod.static("/moto/", "web/moto");
mod.static("/meta/", "web/meta"); mod.static("/meta/", "web/meta");

22
src/mode/cam/animate.js
View file

@ -17,7 +17,8 @@ self.kiri.loader.push(function() {
speedLabel, speedLabel,
speed, speed,
pauseButton, pauseButton,
playButton; playButton,
posOffset = { x:0, y:0, z:0 };
// ---( CLIENT FUNCTIONS )--- // ---( CLIENT FUNCTIONS )---
@ -92,8 +93,11 @@ self.kiri.loader.push(function() {
return; return;
} }
if (data.mesh_add) { if (data.mesh_add) {
const { id, ind, pos } = data.mesh_add; const { id, ind, pos, offset } = data.mesh_add;
meshAdd(id, ind, pos); meshAdd(id, ind, pos);
if (offset) {
posOffset = offset;
}
} }
if (data.mesh_del) { if (data.mesh_del) {
deleteMesh(data.mesh_del); deleteMesh(data.mesh_del);
@ -107,9 +111,9 @@ self.kiri.loader.push(function() {
mesh.position.z = pos.z; mesh.position.z = pos.z;
SPACE.update(); SPACE.update();
if (id !== 0) { if (id !== 0) {
toolPosX.value = (pos.x * unitScale).toFixed(2); toolPosX.value = ((pos.x + posOffset.x) * unitScale).toFixed(2);
toolPosY.value = (pos.y * unitScale).toFixed(2); toolPosY.value = ((pos.y + posOffset.y) * unitScale).toFixed(2);
toolPosZ.value = (pos.z * unitScale).toFixed(2); toolPosZ.value = ((pos.z + posOffset.z) * unitScale).toFixed(2);
} }
} }
} }
@ -221,6 +225,7 @@ self.kiri.loader.push(function() {
if (KIRI.worker) if (KIRI.worker)
KIRI.worker.animate_setup = function(data, send) { KIRI.worker.animate_setup = function(data, send) {
const { settings } = data; const { settings } = data;
const { process } = settings;
const print = current.print; const print = current.print;
const density = parseInt(settings.controller.animesh) * 1000; const density = parseInt(settings.controller.animesh) * 1000;
@ -235,6 +240,11 @@ self.kiri.loader.push(function() {
const stepsX = Math.floor(stock.x / step); const stepsX = Math.floor(stock.x / step);
const stepsY = Math.floor(stock.y / step); const stepsY = Math.floor(stock.y / step);
const { pos, ind } = createGrid(stepsX, stepsY, stock, step); const { pos, ind } = createGrid(stepsX, stepsY, stock, step);
const offset = {
x: process.outputOriginCenter ? 0 : stock.x / 2,
y: process.outputOriginCenter ? 0 : stock.y / 2,
z: process.camOriginTop ? -stock.z : 0
}
grid = pos; grid = pos;
gridX = stepsX; gridX = stepsX;
@ -248,7 +258,7 @@ self.kiri.loader.push(function() {
center = Object.assign({}, stock.center); center = Object.assign({}, stock.center);
center.z -= stock.z / 2; center.z -= stock.z / 2;
send.data({ mesh_add: { id: 0, pos, ind } }); send.data({ mesh_add: { id: 0, pos, ind, offset } });
send.data({ mesh_move: { id: 0, pos: center } }); send.data({ mesh_move: { id: 0, pos: center } });
send.done(); send.done();
}; };