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

Kernel_23: Call function objects from CGAL::Segment_3

This commit is contained in:
Andreas Fabri 2022-03-17 12:14:43 +01:00
parent c837828770
commit d39c7742f1
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cartesian_kernel/include/CGAL/Cartesian/Direction_3.h
View File

@ -52,10 +52,10 @@ public:
{ *this = l.rep().direction(); } { *this = l.rep().direction(); }
explicit DirectionC3(const Ray_3 &r) explicit DirectionC3(const Ray_3 &r)
{ *this = r.direction(); } { *this = r.rep().direction(); }
explicit DirectionC3(const Segment_3 &s) explicit DirectionC3(const Segment_3 &s)
{ *this = s.direction(); } { *this = s.rep().direction(); }
DirectionC3(const FT &x, const FT &y, const FT &z) DirectionC3(const FT &x, const FT &y, const FT &z)
: base(CGAL::make_array(x, y, z)) {} : base(CGAL::make_array(x, y, z)) {}

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

@ -3988,7 +3988,7 @@ namespace CartesianKernelFunctors {
result_type result_type
operator()( const Segment_3& s, const Point_3& p) const operator()( const Segment_3& s, const Point_3& p) const
{ return s.has_on(p); } { return s.rep().has_on(p); }
result_type result_type
operator()( const Plane_3& pl, const Point_3& p) const operator()( const Plane_3& pl, const Point_3& p) const

6
Homogeneous_kernel/include/CGAL/Homogeneous/DirectionH3.h
View File

@ -49,16 +49,16 @@ public:
//: base(p) {} //: base(p) {}
DirectionH3(const Vector_3 & v ) DirectionH3(const Vector_3 & v )
{ *this = v.direction(); } { *this = v.rep().direction(); }
DirectionH3(const Line_3 & l ) DirectionH3(const Line_3 & l )
{ *this = l.rep().direction(); } { *this = l.rep().direction(); }
DirectionH3(const Ray_3 & r ) DirectionH3(const Ray_3 & r )
{ *this = r.direction(); } { *this = r.rep().direction(); }
DirectionH3(const Segment_3 & s ) DirectionH3(const Segment_3 & s )
{ *this = s.direction(); } { *this = s.rep().direction(); }
// the fourth argument is not documented. Should go away ? // the fourth argument is not documented. Should go away ?
DirectionH3(const RT& x, const RT& y, DirectionH3(const RT& x, const RT& y,

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

@ -4090,7 +4090,7 @@ namespace HomogeneousKernelFunctors {
result_type result_type
operator()( const Segment_3& s, const Point_3& p) const operator()( const Segment_3& s, const Point_3& p) const
{ return s.has_on(p); } { return s.rep().has_on(p); }
result_type result_type
operator()( const Plane_3& pl, const Point_3& p) const operator()( const Plane_3& pl, const Point_3& p) const

9
Kernel_23/include/CGAL/Segment_3.h
View File

@ -136,10 +136,8 @@ public:
} }
bool has_on(const Point_3 &p) const bool has_on(const Point_3 &p) const
{ // TODO : use one predicate. {
return R_().are_ordered_along_line_3_object()(source(), return R().has_on_3_object()(*this, p);
p,
target());
} }
Segment_3 opposite() const Segment_3 opposite() const
@ -149,8 +147,7 @@ public:
Direction_3 direction() const Direction_3 direction() const
{ {
typename R::Construct_vector_3 construct_vector; return R().construct_direction_3_object()(*this);
return Direction_3( construct_vector( source(), target()));
} }
bool is_degenerate() const bool is_degenerate() const