zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring some parallelism to boolean code

pull/623/head
phkahler 2020-05-19 20:42:06 -04:00
parent c89a2e4f62
commit 89e6559e2d
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/srf/boolean.cpp
View File

@ -403,7 +403,8 @@ void SSurface::EdgeNormalsWithinSurface(Point2d auv, Point2d buv,
SSurface SSurface::MakeCopyTrimAgainst(SShell *parent,
SShell *sha, SShell *shb,
SShell *into,
SSurface::CombineAs type)
SSurface::CombineAs type,
int dbg_index)
{
bool opA = (parent == sha);
SShell *agnst = opA ? shb : sha;
@ -594,9 +595,11 @@ SSurface SSurface::MakeCopyTrimAgainst(SShell *parent,
SPolygon poly = {};
final.l.ClearTags();
if(!final.AssemblePolygon(&poly, NULL, /*keepDir=*/true)) {
if(!final.AssemblePolygon(&poly, NULL, /*keepDir=*/true))
#pragma omp critical
{
into->booleanFailed = true;
dbp("failed: I=%d, avoid=%d", I, choosing.l.n);
dbp("failed: I=%d, avoid=%d", I+dbg_index, choosing.l.n);
DEBUGEDGELIST(&final, &ret);
}
poly.Clear();
@ -609,13 +612,18 @@ SSurface SSurface::MakeCopyTrimAgainst(SShell *parent,
}
void SShell::CopySurfacesTrimAgainst(SShell *sha, SShell *shb, SShell *into, SSurface::CombineAs type) {
SSurface *ss;
for(ss = surface.First(); ss; ss = surface.NextAfter(ss)) {
#pragma omp parallel for
for (int i = 0; i < surface.n; i++)
{
SSurface *ss = &surface[i];
SSurface ssn;
ssn = ss->MakeCopyTrimAgainst(this, sha, shb, into, type);
ss->newH = into->surface.AddAndAssignId(&ssn);
I++;
ssn = ss->MakeCopyTrimAgainst(this, sha, shb, into, type, i);
#pragma omp critical
{
ss->newH = into->surface.AddAndAssignId(&ssn);
}
}
I += surface.n;
}
void SShell::MakeIntersectionCurvesAgainst(SShell *agnst, SShell *into) {
@ -758,9 +766,9 @@ void SShell::MakeFromBoolean(SShell *a, SShell *b, SSurface::CombineAs type) {
// All of the BSP routines that we use to perform and accelerate polygon ops.
//-----------------------------------------------------------------------------
void SShell::MakeClassifyingBsps(SShell *useCurvesFrom) {
SSurface *ss;
for(ss = surface.First(); ss; ss = surface.NextAfter(ss)) {
ss->MakeClassifyingBsp(this, useCurvesFrom);
#pragma omp parallel for
for(int i = 0; i<surface.n; i++) {
surface[i].MakeClassifyingBsp(this, useCurvesFrom);
}
}

2
src/srf/surface.h
View File

@ -299,7 +299,7 @@ public:
SShell *shell, SShell *sha, SShell *shb);
void FindChainAvoiding(SEdgeList *src, SEdgeList *dest, SPointList *avoid);
SSurface MakeCopyTrimAgainst(SShell *parent, SShell *a, SShell *b,
SShell *into, SSurface::CombineAs type);
SShell *into, SSurface::CombineAs type, int dbg_index);
void TrimFromEdgeList(SEdgeList *el, bool asUv);
void IntersectAgainst(SSurface *b, SShell *agnstA, SShell *agnstB,
SShell *into);