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

simplify union to clipper wrappers

Browse source
This commit is contained in:
Stewart Allen 2021-12-12 11:53:14 -05:00
commit f8cf66e7d5
2 changed files with 13 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/geo/polygon.js
View file

@ -1757,10 +1757,6 @@
return (a1 > a2) ? a2 / a1 : a1 / a2; return (a1 > a2) ? a2 / a1 : a1 / a2;
}; };
PRO.areaOrLength = function(poly) {
return this.length === poly.length || this.areaDiff(poly) > 0.98;
};
/** /**
* return logical OR of two polygons' enclosed areas * return logical OR of two polygons' enclosed areas
* *
@ -1769,65 +1765,7 @@
*/ */
PRO.union = function(poly, min, all) { PRO.union = function(poly, min, all) {
if (!this.overlaps(poly)) return null; if (!this.overlaps(poly)) return null;
return POLY.union([this,poly], min, all);
let fillang = this.fillang && this.area() > poly.area() ? this.fillang : poly.fillang,
clib = self.ClipperLib,
ctyp = clib.ClipType,
ptyp = clib.PolyType,
cfil = clib.PolyFillType,
clip = new clib.Clipper(),
ctre = new clib.PolyTree(),
sp1 = this.toClipper(),
sp2 = poly.toClipper(),
minarea = min >= 0 ? min : 0.1;
clip.AddPaths(sp1, ptyp.ptSubject, true);
clip.AddPaths(sp2, ptyp.ptClip, true);
if (clip.Execute(ctyp.ctUnion, ctre, cfil.pftEvenOdd, cfil.pftEvenOdd)) {
let union = POLY().fromClipperTreeUnion(ctre, poly.getZ(), minarea);
if (all) {
if (union.length === 2) {
let src = [ this.leftmost(), poly.leftmost() ];
let dst = [ union[0].leftmost(), union[1].leftmost() ];
if (leftmost(src[0], src[1]) === src[1]) {
src.reverse();
}
if (leftmost(dst[0], dst[1]) === dst[1]) {
dst.reverse();
}
if (
src[0].poly && src[1].poly && // missing for cam tabs
src[0].isEqual2D(dst[0]) &&
src[1].isEqual2D(dst[1]) &&
src[0].poly.areaOrLength(dst[0].poly) &&
src[1].poly.areaOrLength(dst[1].poly)
) {
return null;
// } else {
// console.log("union debug", {
// src,
// dst,
// d0: src[0].poly.areaDiff(dst[0].poly),
// d1: src[1].poly.areaDiff(dst[1].poly),
// m0: src[0].isEqual2D(dst[0]),
// m1: src[1].isEqual2D(dst[1])
// });
}
}
return union;
}
if (union.length === 1) {
union = union[0];
union.fillang = fillang;
return union;
} else {
console.trace({check_union_call_path: union, this: this, poly});
}
}
return null;
}; };
/** ****************************************************************** /** ******************************************************************

34
src/geo/polygons.js
View file

@ -392,31 +392,19 @@
} }
} }
let out = polys.slice(), i, j, union, uset = []; let clib = self.ClipperLib,
ctyp = clib.ClipType,
ptyp = clib.PolyType,
clip = new clib.Clipper(),
ctre = new clib.PolyTree();
outer: for (i=0; i<out.length; i++) { clip.AddPaths(toClipper(polys), ptyp.ptSubject, true);
if (!out[i]) continue;
for (j=i+1; j<out.length; j++) { if (clip.Execute(ctyp.ctUnion, ctre)) {
if (!out[j]) continue; return fromClipperTree(ctre, polys[0].getZ());
union = out[i].union(out[j], minarea, all); } else {
if (union) { return [];
out[i] = null;
out[j] = null;
if (all) {
out.appendAll(union);
} else {
out.push(union);
}
continue outer;
}
}
} }
for (i=0; i<out.length; i++) {
if (out[i]) uset.push(out[i]);
}
return uset;
} }
/** /**