ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-25 05:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

csg2d - fix CleanupResult

Browse Source 
Check for more edge properties (maxh, bc etc.) before removing
"intermediate" and unnecessary vertices
This commit is contained in:
Matthias Hochsteger 2020-11-03 18:41:09 +01:00
parent b855b419da
commit 45059fa7af
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libsrc/geom2d/csg2d.cpp
View File

@ -1292,21 +1292,39 @@ void CreateResult(Solid2d & sp, Solid2d & sr, bool UNION)
} }
} }
// Check if vertex v is not necessary (i.e. is on the line v->prev, v->next and has same info as v->prev and no pinfo
bool canRemoveVertex( Vertex * v )
{
return false;
if(v->spline)
return false;
if(v->pinfo.name != POINT_NAME_DEFAULT)
return false;
if(v->pinfo.maxh != MAXH_DEFAULT)
return false;
if(v->info.bc != v->prev->info.bc || v->info.maxh != v->prev->info.maxh )
return false;
if(fabs(Area(*v->prev,*v,*v->next)) >= EPSILON)
return false;
return true;
}
void CleanUpResult(Solid2d & sr) void CleanUpResult(Solid2d & sr)
{ {
auto & RR = sr.polys; auto & RR = sr.polys;
for (Loop& R : RR) for (Loop& R : RR)
{ {
while ( (R.first.get() != NULL) && (fabs(Area(*R.first->prev,*R.first,*R.first->next)) < EPSILON) ) while ( (R.first.get() != NULL) && canRemoveVertex(R.first.get()))
R.Remove(R.first.get()); R.Remove(R.first.get());
if (R.first.get() != NULL) if (R.first.get() != NULL)
for (Vertex* V : R.Vertices(ALL)) for (Vertex* V : R.Vertices(ALL))
if (!V->spline && !V->prev->spline && fabs(Area(*V->prev,*V,*V->next)) < EPSILON) if (canRemoveVertex(V))
{
R.Remove(V); R.Remove(V);
} }
}
for (int i = RR.Size()-1; i>=0; i--) for (int i = RR.Size()-1; i>=0; i--)
if(RR[i].Size()==0) if(RR[i].Size()==0)
RR.RemoveElement(i); RR.RemoveElement(i);