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

Merge pull request #3053 from maxGimeno/Kernel-construct_projected_point_3_for_ray_3-GF 

Kernel: Add an operator for a Ray_3 to ConstructProjectedPoint_3
This commit is contained in:
Sebastien Loriot 2018-05-15 22:12:31 +02:00 committed by GitHub
parent 1b84d7402d d3b425281d
commit 962e9eb3c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AABB_tree/doc/AABB_tree/Concepts/AABBGeomTraits.h
View File

@ -66,7 +66,8 @@ typedef unspecified_type Construct_sphere_3;
/*!
A functor object to compute the point on a geometric primitive which is closest from a query. Provides the operator:
`Point_3 operator()(const Type_2& type_2, const Point_3& p);` where `Type_2` is any type among `Segment_3` and `Triangle_3`. The operator returns the point on `type_2` which is closest to `p`.
`Point_3 operator()(const Type_2& type_2, const Point_3& p);` where `Type_2` can be any of the following types : `Segment_3`, `Ray_3`, or `Triangle_3`.
The operator returns the point on `type_2` which is closest to `p`.
*/
typedef unspecified_type Construct_projected_point_3;

5
Cartesian_kernel/include/CGAL/Cartesian/function_objects.h
View File

@ -3181,6 +3181,7 @@ namespace CartesianKernelFunctors {
typedef typename K::Line_3 Line_3;
typedef typename K::Triangle_3 Triangle_3;
typedef typename K::Segment_3 Segment_3;
typedef typename K::Ray_3 Ray_3;
typedef typename K::FT FT;
public:
typedef Point_3 result_type;
@ -3215,6 +3216,10 @@ namespace CartesianKernelFunctors {
Point_3
operator()( const Segment_3& s, const Point_3& p ) const
{ return CommonKernelFunctors::Construct_projected_point_3<K>()(p,s,K()); }
Point_3
operator()( const Ray_3& r, const Point_3& p ) const
{ return CommonKernelFunctors::Construct_projected_point_3<K>()(p,r,K()); }
};
template <class K>

5
Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h
View File

@ -3315,6 +3315,7 @@ namespace HomogeneousKernelFunctors {
typedef typename K::Vector_3 Vector_3;
typedef typename K::Triangle_3 Triangle_3;
typedef typename K::Segment_3 Segment_3;
typedef typename K::Ray_3 Ray_3;
public:
typedef Point_3 result_type;
@ -3351,6 +3352,10 @@ namespace HomogeneousKernelFunctors {
Point_3
operator()( const Segment_3& s, const Point_3& p ) const
{ return CommonKernelFunctors::Construct_projected_point_3<K>()(p,s,K()); }
Point_3
operator()( const Ray_3& r, const Point_3& p ) const
{ return CommonKernelFunctors::Construct_projected_point_3<K>()(p,r,K()); }
};
template <class K>

6
Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h
View File

@ -5976,6 +5976,12 @@ public:
*/
Kernel::Point_3 operator()(const Kernel::Segment_3& s,
const Kernel::Point_3& p);
/*!
returns the point of `r` that is the closest to `p`.
*/
Kernel::Point_3 operator()(const Kernel::Ray_3& r,
const Kernel::Point_3& p);
/*!
returns the point of `t` that is the closest to `p`.

32
Kernel_23/include/CGAL/Kernel/function_objects.h
View File

@ -2855,10 +2855,7 @@ namespace CommonKernelFunctors {
const typename K::Segment_3& segment,
const K& k)
{
typedef typename K::Point_3 Point_3;
typename K::Construct_projected_point_3 projection =
k.construct_projected_point_3_object();
typename K::Is_degenerate_3 is_degenerate =
k.is_degenerate_3_object();
typename K::Construct_vertex_3 vertex =
@ -2867,20 +2864,27 @@ namespace CommonKernelFunctors {
if(is_degenerate(segment))
return vertex(segment, 0);
// Project query on segment supporting line
const Point_3 proj = projection(segment.supporting_line(), query);
Point_3 closest_point_on_segment;
bool inside = is_inside_segment_3(proj,segment,closest_point_on_segment,k);
if(segment.to_vector() * (query-segment.source()) <= 0)
return segment.source();
if(segment.to_vector() * (query-segment.target()) >= 0)
return segment.target();
// If proj is inside segment, returns it
if ( inside )
return proj;
// Else returns the constructed point
return closest_point_on_segment;
return k.construct_projected_point_3_object()(segment.supporting_line(), query);
}
typename K::Point_3
operator()(const typename K::Point_3& query,
const typename K::Ray_3& ray,
const K& k)
{
if ( ray.to_vector() * (query-ray.source()) <= 0)
return ray.source();
else
{
return k.construct_projected_point_3_object()(ray.supporting_line(), query);
}
}
// code for operator for plane and point is defined in
// CGAL/Cartesian/function_objects.h and CGAL/Homogeneous/function_objects.h
};

9
Kernel_23/test/Kernel_23/include/CGAL/_test_fct_constructions_3.h
View File

@ -26,12 +26,13 @@
template <class R>
bool
_test_fct_constructions_3(const R&)
_test_fct_constructions_3(const R& r)
{
typedef typename R::RT RT;
typedef typename R::Point_3 Point;
typedef typename R::Weighted_point_3 Weighted_point;
typedef typename R::Segment_3 Segment;
typedef typename R::Ray_3 Ray;
typedef typename R::Plane_3 Plane;
typedef typename R::Vector_3 Vector;
typedef typename R::Triangle_3 Triangle;
@ -129,6 +130,12 @@ _test_fct_constructions_3(const R&)
assert( CGAL::weighted_circumcenter( wp000_b, wp100_b, wp010_b) == wp000_b);
assert( CGAL::weighted_circumcenter( wp000_b, wp100_b, wp010_b, wp001_b) == wp000_b);
// projected point
Ray ray(Point(0,0,0), Point (1,1,0));
Segment s(Point(0,0,0), Point (1,1,0));
assert( r.construct_projected_point_3_object()(ray, Point(-1,0,0)) == Point(0,0,0));
assert( r.construct_projected_point_3_object()(s, Point(-1,0,0)) == Point(0,0,0));
assert( r.construct_projected_point_3_object()(s, Point(2,0,0)) == Point(1,1,0));
return true;
}