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

add cam visualization for imported gcode when stock set

Browse source
This commit is contained in:
Stewart Allen 2020-11-25 12:51:18 -05:00
commit 14359325b9
6 changed files with 41 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
notes.md
View file

@ -23,6 +23,8 @@
* `P` duplicate objects should share same slice data unless rotated or scaled
* `P` worker state cache cleanup and organization
* `P` client/worker interface normalization
* `P` optimize object import to vertices + indexes to save memory
* `P` allow selection to me decimated on demand (context menu?)
# FDM

1
src/geo/bounds.js
View file

@ -39,6 +39,7 @@
b.miny = this.miny;
b.maxx = this.maxx;
b.maxy = this.maxy;
b.maxy = this.maxy;
return b;
};

1
src/kiri/print.js
View file

@ -261,6 +261,7 @@
G0G1(false, line);
break;
case 'M6':
tool = parseInt(line[0].substring(1));
break;
}
});

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

@ -28,6 +28,9 @@ self.kiri.loader.push(function() {
WORLD = SPACE.platform.world;
KIRI.client.animate_setup(API.conf.get(), data => {
checkMeshCommands(data);
if (!(data && data.mesh_add)) {
return;
}
const UC = API.uc;
const layer = $('layer-animate');
layer.innerHTML = '';
@ -71,6 +74,7 @@ self.kiri.loader.push(function() {
mesh.position.x = pos.x;
mesh.position.y = pos.y;
mesh.position.z = pos.z;
SPACE.update();
}
}
if (data.mesh_update) {
@ -136,9 +140,6 @@ self.kiri.loader.push(function() {
function handleGridUpdate(data) {
checkMeshCommands(data);
if (data && data.done) {
console.log('done', data);
}
}
if (KIRI.client)
@ -158,20 +159,21 @@ self.kiri.loader.push(function() {
// ---( WORKER FUNCTIONS )---
let path, pathIndex, stock, grid, gridX, gridY, tool, tools, rez, last;
let path, pathIndex, stock, grid, gridX, gridY, tool, tools, rez, last, toolID = 1;
if (KIRI.worker)
KIRI.worker.animate_setup = function(data, send) {
const { settings } = data;
const print = current.print;
const density = parseInt(settings.controller.animesh) * 1000;
pathIndex = 0;
path = print.output.flat();
tools = settings.tools;
stock = settings.stock;
path = current.print.output.flat();
rez = 1/Math.sqrt(density/(stock.x * stock.y));
// const center = stock.center;
const step = rez;
const stepsX = Math.floor(stock.x / step);
const stepsY = Math.floor(stock.y / step);
@ -186,7 +188,12 @@ self.kiri.loader.push(function() {
animating = false;
animateClear = false;
send.done({ mesh_add: { id: 0, pos, ind } });
const center = Object.assign({}, stock.center);
center.z -= stock.z / 2;
send.data({ mesh_add: { id: 0, pos, ind } });
send.data({ mesh_move: { id: 0, pos: center } });
send.done();
};
function createGrid(stepsX, stepsY, size, step) {
@ -269,17 +276,16 @@ self.kiri.loader.push(function() {
}
animating = true;
stepsRemain--;
if (next.tool && (!tool || tool.getNumber() !== next.tool)) {
if (next.tool >= 0 && (!tool || tool.getNumber() !== next.tool)) {
updateTool(next.tool, send);
}
const id = tool.getID();
const id = toolID;
if (last) {
const lp = last.point, np = next.point;
const dx = np.x - lp.x, dy = np.y - lp.y, dz = np.z - lp.z;
// skip moves that are closer than resolution
if (Math.sqrt(dx*dx +dy*dy + dz*dz) < rez) {
setTimeout(() => { renderPath(send, 0) });
setTimeout(() => { renderPath(send) }, 0);
return;
}
@ -363,7 +369,7 @@ self.kiri.loader.push(function() {
function updateTool(toolnum, send) {
if (tool) {
send.data({ mesh_del: tool.getID() });
send.data({ mesh_del: toolID });
}
tool = new CAM.Tool({ tools }, undefined, toolnum);
tool.generateProfile(rez);
@ -381,7 +387,7 @@ self.kiri.loader.push(function() {
const dz = prof[i++];
pos[(dx * pix + dy) * 3 + 2] = -dz;
}
send.data({ mesh_add: { id:tool.getID(), pos, ind }});
send.data({ mesh_add: { id:++toolID, pos, ind }});
}
});

11
src/mode/cam/client.js
View file

@ -13,6 +13,7 @@
isAnimate,
isArrange,
isCamMode,
isParsed,
camStock,
API, SPACE, STACKS, MODES, VIEWS, UI, UC;
@ -70,13 +71,21 @@
], updateStock);
api.event.on("preview.end", () => {
isParsed = false;
if (camStock) STACKS.getStack("bounds").button("animate", animate);
});
api.event.on("code.loaded", (info) => {
if (isCamMode && camStock) {
isParsed = true;
STACKS.getStack("parse", SPACE.platform.world).button("animate", animate);
}
});
};
function animate() {
isAnimate = true;
API.widgets.opacity(0.75);
API.widgets.opacity(isParsed ? 0 : 0.75);
API.hide.slider();
STACKS.clear();
CAM.animate(API);

11
src/mode/cam/tool.js
View file

@ -13,9 +13,14 @@
class Tool {
constructor(settings, id, number) {
if (number >= 0) {
this.tool = settings.tools.filter(tool => tool.number === number)[0];
this.tool = settings.tools.filter(tool => tool.number == number)[0];
} else {
this.tool = settings.tools.filter(tool => tool.id === id)[0];
this.tool = settings.tools.filter(tool => tool.id == id)[0];
}
if (!this.tool) {
this.tool = Object.assign({}, settings.tools[0]);
this.tool.number = number >= 0 ? number : this.tool.number;
this.tool.id = id >= 0 ? id : this.tool.id;
}
}
@ -112,7 +117,7 @@
this.profile = toolOffset;
this.profileDim = {
size: flute_diameter,
pix: profile_pix_iter
pix: profile_pix_iter + 2
};
return this;
}