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

Deal with degenerate queries

This commit is contained in:
Andreas Fabri 2020-10-08 13:01:28 +01:00
parent a9b78f97a5
commit ef75dbb26d
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/Envelope.h
View File

@ -1720,6 +1720,9 @@ struct Envelope {
bool bool
operator()(const Point_3& source, const Point_3& target) const operator()(const Point_3& source, const Point_3& target) const
{ {
if(source == target){
return (*this)(source);
}
std::vector<unsigned int> prismindex; std::vector<unsigned int> prismindex;
Segment_3 query(source,target); Segment_3 query(source,target);
tree.all_intersected_primitives(query, std::back_inserter(prismindex)); tree.all_intersected_primitives(query, std::back_inserter(prismindex));
@ -1735,16 +1738,25 @@ struct Envelope {
bool bool
operator()(const Point_3& t0, const Point_3& t1, const Point_3& t2) const operator()(const Point_3& t0, const Point_3& t1, const Point_3& t2) const
{ {
if (collinear(t0,t1,t2)){
Point_3 p0(t0), p1(t1), p2(t2);
if(lexicographically_xyz_smaller(p1,p0)){
std::swap(p1,p0);
}
if(lexicographically_xyz_smaller(p2,p1)){
std::swap(p2,p1);
}
if(lexicographically_xyz_smaller(p1,p0)){
std::swap(p1,p0);
}
return (*this)(p0,p2);
}
std::vector<unsigned int> prismindex; std::vector<unsigned int> prismindex;
Triangle_3 query(t0, t1, t2); Triangle_3 query(t0, t1, t2);
tree.all_intersected_primitives(query, std::back_inserter(prismindex)); tree.all_intersected_primitives(query, std::back_inserter(prismindex));
std::sort(prismindex.begin(), prismindex.end());
#ifdef CGAL_ENVELOPE_DEBUG // only needed when we want to compare runs with FastEnvelope
for(int i=0; i < prismindex.size(); i++){ // std::sort(prismindex.begin(), prismindex.end());
std::cout << prismindex[i] << " ";
}
std::cout << std::endl;
#endif
#ifdef CGAL_ENVELOPE_DEBUG #ifdef CGAL_ENVELOPE_DEBUG
for(int i = 0; i < prismindex.size(); i++){ for(int i = 0; i < prismindex.size(); i++){

2
Surface_mesh_simplification/test/Surface_mesh_simplification/test_edge_collapse_Envelope.cpp
View File

@ -96,7 +96,7 @@ int main(int argc, char** argv)
std::ifstream is(argc > 1 ? argv[1] : "data/helmet.off"); std::ifstream is(argc > 1 ? argv[1] : "data/helmet.off");
is >> ref_mesh; is >> ref_mesh;
SMS::Count_stop_predicate<Surface> stop(num_halfedges(ref_mesh)/10); SMS::Count_stop_predicate<Surface> stop(num_halfedges(ref_mesh)/100);
Stats stats; Stats stats;
My_visitor vis(&stats); My_visitor vis(&stats);

2
Surface_mesh_simplification/test/Surface_mesh_simplification/test_edge_collapse_FastEnvelope.cpp
View File

@ -96,7 +96,7 @@ int main(int argc, char** argv)
std::ifstream is(argc > 1 ? argv[1] : "data/helmet.off"); std::ifstream is(argc > 1 ? argv[1] : "data/helmet.off");
is >> ref_mesh; is >> ref_mesh;
SMS::Count_stop_predicate<Surface> stop(num_halfedges(ref_mesh)/10); SMS::Count_stop_predicate<Surface> stop(num_halfedges(ref_mesh)/100);
Stats stats; Stats stats;
My_visitor vis(&stats); My_visitor vis(&stats);