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

bump rev 4.0.1 -- add more gerber code

Browse source
This commit is contained in:
Stewart Allen 2024-06-28 17:08:08 -04:00
commit b4ad2bef61
4 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "grid-apps", "name": "grid-apps",
"version": "4.0.0", "version": "4.0.1",
"description": "grid.space 3d slice & modeling tools", "description": "grid.space 3d slice & modeling tools",
"author": "Stewart Allen <sa@grid.space>", "author": "Stewart Allen <sa@grid.space>",
"license": "MIT", "license": "MIT",

29
src/kiri-mode/cam/client.js
View file

@ -172,12 +172,22 @@ CAM.init = function(kiri, api) {
poly = undefined; poly = undefined;
let { shape } = tool; let { shape } = tool;
switch (shape.type) { switch (shape.type) {
case 'obround':
if (shape.xSize === shape.ySize) {
circs.push(base.newPolygon().centerCircle(pos, shape.xSize / 2, 20));
} else {
console.log('TODO', shape);
}
break;
case 'circle': case 'circle':
circs.push(base.newPolygon().centerCircle(pos, shape.diameter / 2, 20)); circs.push(base.newPolygon().centerCircle(pos, shape.diameter / 2, 20));
break; break;
case 'rectangle': case 'rectangle':
rects.push(base.newPolygon().centerRectangle(pos, shape.xSize, shape.ySize)); rects.push(base.newPolygon().centerRectangle(pos, shape.xSize, shape.ySize));
break; break;
default:
console.log('TODO', shape);
break;
} }
break; break;
} }
@ -192,12 +202,24 @@ CAM.init = function(kiri, api) {
z: 0 z: 0
}); });
} }
console.log(polys, circs, rects); const open = [];
const closed = [];
for (let poly of polys) {
if (poly.appearsClosed()) {
closed.push(...poly.simplify());
} else {
open.push(poly);
}
}
console.log({ open, closed, circs, rects });
const widget = api.widgets.all()[0]; const widget = api.widgets.all()[0];
const stack = new kiri.Stack(widget.mesh); const stack = new kiri.Stack(widget.mesh);
const layers = new kiri.Layers(); const layers = new kiri.Layers();
for (let poly of polys) { for (let poly of open) {
layers.setLayer("paths", {line: 0xff0000}, false).addPoly(poly); layers.setLayer("open", {line: 0xff8800}, false).addPoly(poly);
}
for (let poly of closed) {
layers.setLayer("close", {line: 0xff0000}, false).addPoly(poly);
} }
for (let poly of circs) { for (let poly of circs) {
layers.setLayer("circs", {line: 0x008800}, false).addPoly(poly); layers.setLayer("circs", {line: 0x008800}, false).addPoly(poly);
@ -206,6 +228,7 @@ CAM.init = function(kiri, api) {
layers.setLayer("rects", {line: 0x0000ff}, false).addPoly(poly); layers.setLayer("rects", {line: 0x0000ff}, false).addPoly(poly);
} }
stack.addLayers(layers); stack.addLayers(layers);
console.log(r, tools);
}); });
api.event.on("widget.add", widget => { api.event.on("widget.add", widget => {

2
src/moto/license.js
View file

@ -5,7 +5,7 @@
let terms = { let terms = {
COPYRIGHT: "Copyright (C) Stewart Allen <sa@grid.space> - All Rights Reserved", COPYRIGHT: "Copyright (C) Stewart Allen <sa@grid.space> - All Rights Reserved",
LICENSE: "See the license.md file included with the source distribution", LICENSE: "See the license.md file included with the source distribution",
VERSION: (is_self ? self : this).debug_version || "4.0.0" VERSION: (is_self ? self : this).debug_version || "4.0.1"
}; };
if (typeof(module) === 'object') { if (typeof(module) === 'object') {

2
web/kiri/manifest.json
View file

@ -1,5 +1,5 @@
{ {
"name": "Kiri:Moto 4.0.0", "name": "Kiri:Moto 4.0.1",
"short_name": "Kiri:Moto", "short_name": "Kiri:Moto",
"description": "Slicer for 3D printers, CNC mills, laser cutters and more", "description": "Slicer for 3D printers, CNC mills, laser cutters and more",
"start_url": "/kiri/", "start_url": "/kiri/",