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

Merge pull request #5096 from maxGimeno/GraphicsView-is_facet_convex-maxGimeno 

GraphicsView: Fix is_facet_convex()
This commit is contained in:
Laurent Rineau 2020-11-04 20:46:04 +01:00
parent daee7209b5 166ad7c8c8
commit 604e3525b6
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
GraphicsView/include/CGAL/Buffer_for_vao.h
View File

@ -502,11 +502,11 @@ public:
// Is it possible that orientation==COPLANAR ? Maybe if V1 or V2 is very small ? // Is it possible that orientation==COPLANAR ? Maybe if V1 or V2 is very small ?
} }
while(++id!=facet.size() && while(++id!=facet.size() &&
(orientation==CGAL::COPLANAR || orientation==CGAL::ZERO)); (orientation==CGAL::COPLANAR ));
//Here, all orientations were COPLANAR. Not sure this case is possible, //Here, all orientations were COPLANAR. Not sure this case is possible,
// but we stop here. // but we stop here.
if (orientation==CGAL::COPLANAR || orientation==CGAL::ZERO) if (orientation==CGAL::COPLANAR)
{ return false; } { return false; }
// Now we compute convexness // Now we compute convexness
@ -523,6 +523,16 @@ public:
if(local_orientation!=CGAL::ZERO && local_orientation!=orientation) if(local_orientation!=CGAL::ZERO && local_orientation!=orientation)
{ return false; } { return false; }
// V1 and V2 are collinear
if(local_orientation==CGAL::ZERO )
{
//TS and TU are opposite
if(CGAL::scalar_product(V1,V2) >=0)
return true;
//TS and TU have the same direction.
else
return false;
}
} }
return true; return true;
} }