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

for area offsets, disable wasm (lacks features) and use round joins for offsets (better tool paths for cnc)

Browse source
This commit is contained in:
Stewart Allen 2025-12-13 15:48:30 -05:00
commit d5b6d4c080
7 changed files with 66 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/geo/point.js
View file

@ -29,8 +29,8 @@ class Point {
toClipper() {
return {
X: this.x * config.clipper,
Y: this.y * config.clipper
X: (this.x * config.clipper) | 0,
Y: (this.y * config.clipper) | 0
};
}

38
src/geo/polygon.js
View file

@ -2070,11 +2070,13 @@ export class Polygon {
* @returns {?Polygon[]}
*/
diff(poly) {
let fillang = this.fillang && this.area() > poly.area() ? this.fillang : poly.fillang,
clip = new Clipper(),
let clip = new Clipper(),
tree = new PolyTree(),
sp1 = this.toClipper(),
sp2 = poly.toClipper();
sp2 = poly.toClipper(),
fillang = this.fillang
&& this.area() > poly.area()
? this.fillang : poly.fillang;
clip.AddPaths(sp1, PathSubject, true);
clip.AddPaths(sp2, PathClip, true);
@ -2116,11 +2118,14 @@ export class Polygon {
* @returns {?Polygon[]}
*/
mask(poly, nullOnEquiv, minarea) {
let fillang = this.fillang && this.area() > poly.area() ? this.fillang : poly.fillang,
clip = new Clipper(),
let clip = new Clipper(),
tree = new PolyTree(),
sp1 = this.toClipper(),
sp2 = poly.toClipper();
sp2 = poly.toClipper(),
fillang = this.fillang
&& this.area() > poly.area()
? this.fillang : poly.fillang;
clip.AddPaths(sp1, PathSubject, true);
clip.AddPaths(sp2, PathClip, true);
@ -2258,28 +2263,23 @@ export class Polygon {
union(poly, min, all) {
if (!this.overlaps(poly)) return null;
let fillang = this.fillang && this.area() > poly.area() ? this.fillang : poly.fillang,
clip = new Clipper(),
let clip = new Clipper(),
tree = new PolyTree(),
sp1 = this.toClipper(),
sp2 = poly.toClipper(),
minarea = min ?? 0.1;
fillang = this.fillang
&& this.area() >= poly.area()
? this.fillang : poly.fillang;
clip.AddPaths(sp1, PathSubject, true);
clip.AddPaths(sp2, PathClip, true);
if (clip.Execute(ClipUnion, tree, FillEvenOdd, FillEvenOdd)) {
let union = POLY.fromClipperTreeUnion(tree, poly.getZ(), minarea);
let union = POLY.fromClipperTreeUnion(tree, poly.getZ(), min ?? 0);
let length = union.length;
if (all) {
if (union.length === 2) {
return null;
// if (this.unionMatch(union) || poly.unionMatch(union)) {
// return null;
// }
}
return union;
}
if (union.length === 1) {
return length === 2 ? null : union;
} else if (length === 1) {
union = union[0];
union.fillang = fillang;
return union;

33
src/geo/polygons.js
View file

@ -441,11 +441,10 @@ export function union(polys, minarea, all, opt = {}) {
let lpre = length(polys);
if (opt.wasm && geo.wasm) {
let min = minarea ?? 0.01;
// let deepLength = polys.map(p => p.deepLength).reduce((a,v) => a+v);
// if (deepLength < 15000)
try {
let out = geo.wasm.js.union(polys, polys[0].getZ()).filter(p => p.area() > min);
console.log({ wasm_union: polys, minarea });
if (minarea) polys = polys.filter(p => p.area() >= minarea);
let out = geo.wasm.js.union(polys, polys[0].getZ());
opt.changes = length(out) - lpre;
return out;
} catch (e) {
@ -461,10 +460,10 @@ export function union(polys, minarea, all, opt = {}) {
if (!out[j]) continue;
union = out[i].union(out[j], minarea, all);
if (union && union.length) {
if (opt.onmerge) {
a = out[i];
b = out[j];
}
// if (opt.onmerge) {
// a = out[i];
// b = out[j];
// }
out[i] = null;
out[j] = null;
if (all) {
@ -472,9 +471,9 @@ export function union(polys, minarea, all, opt = {}) {
} else {
out.push(union);
}
if (opt.onmerge) {
opt.onmerge(a, b, union);
}
// if (opt.onmerge) {
// opt.onmerge(a, b, union);
// }
continue outer;
}
}
@ -629,7 +628,7 @@ export function offset(polys, dist, opts = {}) {
mina = numOrDefault(opts.minArea, 0.1),
zed = opts.z || 0;
if (opts.wasm && geo.wasm) {
if (opts.wasm && geo.wasm && join === JoinType.jtMiter && fill === FillNonZero && type === EndType.etClosedPolygon) {
try {
polys = geo.wasm.js.offset(polys, offs, zed, clean ? config.clipperClean : 0, simple ? 1 : 0);
if (open.length) polys.appendAll(open);
@ -651,7 +650,7 @@ export function offset(polys, dist, opts = {}) {
coff.AddPaths(poly, join, type);
}
// perform offset
coff.Execute(tree, offs * config.clipper);
coff.Execute(tree, (offs * config.clipper) | 0);
// convert back from clipper output format
polys = fromClipperTree(tree, zed, null, null, mina);
}
@ -660,10 +659,14 @@ export function offset(polys, dist, opts = {}) {
// if specified, perform offset gap analysis
if (opts.gaps && polys.length) {
let oneg = offset(polys, -offs, {
fill: opts.fill, join: opts.join, type: opts.type, z: opts.z, minArea: mina
fill: opts.fill,
join: opts.join,
type: opts.type,
z: opts.z,
minArea: mina
});
let suba = [];
let diff = subtract(orig, oneg, suba, null, zed);
subtract(orig, oneg, suba, null, zed);
opts.gaps.append(suba, opts.flat);
}