songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

facet bounding two unselected volumes is handled as separated convex part.

This commit is contained in:
Peter Hachenberger 2010-05-04 16:38:29 +00:00
parent 7ba952351b
commit 8051eccc1e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Minkowski_sum_3/include/CGAL/Minkowski_sum_3/bipartite_nary_union_sorted_combined.h
View File

@ -173,8 +173,11 @@ bipartite_nary_union_sorted_combined(Nef_polyhedron& N0,
for(fci = N0.halffacets_begin(); for(fci = N0.halffacets_begin();
fci != N0.halffacets_end(); ++fci) { fci != N0.halffacets_end(); ++fci) {
if(fci->is_twin()) continue; if(fci->is_twin()) continue;
if(fci->incident_volume() != if( fci->incident_volume() != fci->twin()->incident_volume() &&
fci->twin()->incident_volume()) continue; ( fci->incident_volume()->mark() || fci->twin()->incident_volume()->mark() ))
{
continue;
}
SHalfedge_const_handle se(fci->facet_cycles_begin()); SHalfedge_const_handle se(fci->facet_cycles_begin());
GM0.push_back(std::make_pair(Gaussian_map(fci), GM0.push_back(std::make_pair(Gaussian_map(fci),
se->source()->source()->point())); se->source()->source()->point()));
@ -182,8 +185,11 @@ bipartite_nary_union_sorted_combined(Nef_polyhedron& N0,
for(fci = N1.halffacets_begin(); for(fci = N1.halffacets_begin();
fci != N1.halffacets_end(); ++fci) { fci != N1.halffacets_end(); ++fci) {
if(fci->is_twin()) continue; if(fci->is_twin()) continue;
if(fci->incident_volume() != if( fci->incident_volume() != fci->twin()->incident_volume() &&
fci->twin()->incident_volume()) continue; ( fci->incident_volume()->mark() || fci->twin()->incident_volume()->mark() ))
{
continue;
}
SHalfedge_const_handle se(fci->facet_cycles_begin()); SHalfedge_const_handle se(fci->facet_cycles_begin());
GM1.push_back(std::make_pair(Gaussian_map(fci), GM1.push_back(std::make_pair(Gaussian_map(fci),
se->source()->source()->point())); se->source()->source()->point()));