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

unroll poly cleaning in subtract

Browse source
This commit is contained in:
Stewart Allen 2021-07-11 11:04:52 -04:00
commit 814b32ccc4
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/mode/fdm/slice.js
View file

@ -1058,7 +1058,7 @@
} }
POLY.subtract(topInner, downInner, bridges, flats, slice.z, minArea, { POLY.subtract(topInner, downInner, bridges, flats, slice.z, minArea, {
// wasm: options.wasm wasm: options.wasm
}); });
}; };

16
wasm/kiri-geo.cpp
View file

@ -143,7 +143,7 @@ Uint32 poly_union(Uint32 memat, Uint32 polys, float offset) {
} }
__attribute__ ((export_name("poly_diff"))) __attribute__ ((export_name("poly_diff")))
Uint32 poly_diff(Uint32 memat, Uint32 polysA, Uint32 polysB, Uint8 AB, Uint8 BA, Uint32 clean) { Uint32 poly_diff(Uint32 memat, Uint32 polysA, Uint32 polysB, Uint8 AB, Uint8 BA, float clean) {
Paths inA(polysA); Paths inA(polysA);
Paths inB(polysB); Paths inB(polysB);
@ -154,27 +154,33 @@ Uint32 poly_diff(Uint32 memat, Uint32 polysA, Uint32 polysB, Uint8 AB, Uint8 BA,
Uint32 resat = pos; Uint32 resat = pos;
if (AB) { if (AB > 0) {
Paths outs; Paths outs;
Clipper clip; Clipper clip;
clip.AddPaths(inA, ptSubject, true); clip.AddPaths(inA, ptSubject, true);
clip.AddPaths(inB, ptClip, true); clip.AddPaths(inB, ptClip, true);
clip.Execute(ctDifference, outs, pftEvenOdd, pftEvenOdd); clip.Execute(ctDifference, outs, pftEvenOdd, pftEvenOdd);
if (clean > 0) { if (clean > 0) {
CleanPolygons(outs, (double)clean); // CleanPolygons(outs, clean);
for (Path po : outs) {
CleanPolygon(po, clean);
}
} }
pos = writePolys(outs, pos); pos = writePolys(outs, pos);
clip.Clear(); clip.Clear();
} }
if (BA) { if (BA > 0) {
Paths outs; Paths outs;
Clipper clip; Clipper clip;
clip.AddPaths(inB, ptSubject, true); clip.AddPaths(inB, ptSubject, true);
clip.AddPaths(inA, ptClip, true); clip.AddPaths(inA, ptClip, true);
clip.Execute(ctDifference, outs, pftEvenOdd, pftEvenOdd); clip.Execute(ctDifference, outs, pftEvenOdd, pftEvenOdd);
if (clean > 0) { if (clean > 0) {
CleanPolygons(outs, (double)clean); // CleanPolygons(outs, clean);
for (Path po : outs) {
CleanPolygon(po, clean);
}
} }
pos = writePolys(outs, pos); pos = writePolys(outs, pos);
clip.Clear(); clip.Clear();

BIN
wasm/kiri-geo.wasm
View file

Binary file not shown.