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

Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch'

This commit is contained in:
Sébastien Loriot 2017-01-25 17:07:10 +01:00
parent be30f05bef 05050905f2
commit 2e1e2a28e6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AABB_tree/include/CGAL/internal/AABB_tree/AABB_ray_intersection.h
View File

@ -179,8 +179,14 @@ private:
as_ray_param_visitor(const Ray* ray) : ray(ray) {}
template<typename T>
FT operator()(const T&)
{ std::cout << "not handled" << std::endl; return FT(); }
FT operator()(const T& s)
{
// intersection is a segment, returns the min relative distance
// of its endpoints
FT r1 = this->operator()(s[0]);
FT r2 = this->operator()(s[1]);
return (std::min)(r1,r2);
}
FT operator()(const Point& point) {
typename AABB_traits::Geom_traits::Vector_3 x(ray->source(), point);