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

Simplify UNION and DIFFERENCE boolean operations.

Browse Source 
Union and difference are optimized by replacing the expression
  (!inShell && !inFace)
which is equivqlent to
  (!inShell && !inSame && !inOpp)
with
  outSide
which is equivalent, since SShell::Class::OUTSIDE is the only remaining possibility.
This commit is contained in:
ruevs 2019-11-23 15:22:15 +02:00 committed by whitequark
parent b5ccf5acf5
commit ec3056773e
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/srf/boolean.cpp
View File

@ -193,28 +193,24 @@ void SSurface::TrimFromEdgeList(SEdgeList *el, bool asUv) {
static bool KeepRegion(SSurface::CombineAs type, bool opA, SShell::Class shell, SShell::Class orig)
{
bool inShell = (shell == SShell::Class::INSIDE),
outSide = (shell == SShell::Class::OUTSIDE),
inSame = (shell == SShell::Class::COINC_SAME),
inOpp = (shell == SShell::Class::COINC_OPP),
inOrig = (orig == SShell::Class::INSIDE);
bool inFace = inSame || inOpp;
// If these are correct, then they should be independent of inShell
// if inFace is true.
if(!inOrig) return false;
switch(type) {
case SSurface::CombineAs::UNION:
if(opA) {
return (!inShell && !inFace);
return outSide;
} else {
return (!inShell && !inFace) || inSame;
return outSide || inSame;
}
case SSurface::CombineAs::DIFFERENCE:
if(opA) {
return (!inShell && !inFace);
return outSide;
} else {
return (inShell && !inFace) || inSame;
return inShell || inSame;
}
default: ssassert(false, "Unexpected combine type");