phynexis-deps/cgal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Optimize equi_distant_line() by merging the calls to

Browse Source 
circumcenter() and cross_product().
- Add ctors to Point_[23] and Vector_[23] that take
  int, double, and FT coordinates, instead of only RT.
This commit is contained in:
Sylvain Pion
2006-08-07 15:57:40 +00:00
parent 923cac500a
commit 38853d1b10
25 changed files with 381 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Homogeneous_kernel/include/CGAL/Homogeneous/function_objects.h
+64
View File
@@ -39,6 +39,7 @@ namespace HomogeneousKernelFunctors {
using CartesianKernelFunctors::Compute_squared_area_3;
using CartesianKernelFunctors::Collinear_3;
using CartesianKernelFunctors::Construct_line_3;
using CartesianKernelFunctors::Construct_equi_distant_line_3;
template <typename K>
class Angle_2
@@ -2845,6 +2846,7 @@ namespace HomogeneousKernelFunctors {
class Construct_point_2
{
typedef typename K::RT RT;
typedef typename K::FT FT;
typedef typename K::Point_2 Point_2;
typedef typename K::Vector_2 Vector_2;
typedef typename K::Line_2 Line_2;
@@ -2857,10 +2859,18 @@ namespace HomogeneousKernelFunctors {
operator()(Origin o) const
{ return Rep(o); }
Point_2
operator()(int x, int y) const
{ return Rep(x, y); }
Point_2
operator()(const RT& x, const RT& y) const
{ return Rep(x, y); }
Point_2
operator()(const FT& x, const FT& y) const
{ return Rep(x, y); }
Point_2
operator()(const RT& x, const RT& y, const RT& w) const
{ return Rep(x, y, w); }
@@ -2887,6 +2897,44 @@ namespace HomogeneousKernelFunctors {
}
};
template <typename K>
class Construct_point_3
{
typedef typename K::RT RT;
typedef typename K::FT FT;
typedef typename K::Point_3 Point_3;
typedef typename Point_3::Rep Rep;
public:
typedef Point_3 result_type;
typedef Arity_tag< 1 > Arity;
Point_3
operator()(Origin o) const
{ return Rep(o); }
// Reactivated, as some functors in Cartesian/function_objects.h
// need it for constructions
//#ifndef CGAL_NO_DEPRECATED_CODE
Point_3
operator()(int x, int y, int z) const
{ return Rep(x, y, z); }
Point_3
operator()(const RT& x, const RT& y, const RT& z) const
{ return Rep(x, y, z); }
Point_3
operator()(const FT& x, const FT& y, const FT& z) const
{ return Rep(x, y, z); }
Point_3
operator()(const RT& x, const RT& y, const RT& z, const RT& w) const
{ return Rep(x, y, z, w); }
//#endif // CGAL_NO_DEPRECATED_CODE
};
template <typename K>
class Construct_projected_point_2
{
@@ -3097,10 +3145,18 @@ namespace HomogeneousKernelFunctors {
operator()( Null_vector) const
{ return Rep(RT(0), RT(0), RT(1)); }
Vector_2
operator()( int x, int y) const
{ return Rep(x, y); }
Vector_2
operator()( const RT& x, const RT& y) const
{ return Rep(x, y); }
Vector_2
operator()( const FT& x, const FT& y) const
{ return Rep(x, y); }
Vector_2
operator()( const RT& x, const RT& y, const RT& w) const
{ return Rep(x, y, w); }
@@ -3165,10 +3221,18 @@ namespace HomogeneousKernelFunctors {
{ return Rep(RT(0), RT(0), RT(0), RT(1)); }
// #ifndef CGAL_NO_DEPRECATED_CODE
Vector_3
operator()( int x, int y, int z) const
{ return Rep(x, y, z); }
Vector_3
operator()( const RT& x, const RT& y, const RT& z) const
{ return Rep(x, y, z); }
Vector_3
operator()( const FT& x, const FT& y, const FT& z) const
{ return Rep(x, y, z); }
Vector_3
operator()( const RT& x, const RT& y, const RT& z, const RT& w) const
{ return Rep(x, y, z, w); }