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

- Moved ctors in the class body.

This commit is contained in:
Sylvain Pion 2000-11-03 11:20:35 +00:00
parent 21b127b3f9
commit e5468a83e8
1 changed files with 25 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
Packages/Cartesian_kernel/include/CGAL/Cartesian/Point_3.h
View File

@ -50,11 +50,25 @@ public:
typedef typename R::Aff_transformation_3_base Aff_transformation_3;
#endif
PointC3();
PointC3(const Origin &o);
PointC3(const Vector_3 &v);
PointC3(const FT &x, const FT &y, const FT &z);
PointC3(const FT &x, const FT &y, const FT &z, const FT &hw);
PointC3()
: Point_handle_3(Point_ref_3()) {}
PointC3(const Origin &)
: Point_handle_3(Point_ref_3(FT(0), FT(0), FT(0))) {}
PointC3(const Vector_3 &v)
: Point_handle_3(v) {}
PointC3(const FT &x, const FT &y, const FT &z)
: Point_handle_3(Point_ref_3(x, y, z)) {}
PointC3(const FT &x, const FT &y, const FT &z, const FT &w)
{
if (w != FT(1))
initialize_with(Point_ref_3(x/w, y/w, z/w));
else
initialize_with(Point_ref_3(x, y, z));
}
bool operator==(const Self &p) const
{
@ -107,45 +121,12 @@ public:
}
Bbox_3 bbox() const;
Self transform( const Aff_transformation_3 &) const;
Self transform(const Aff_transformation_3 &t) const
{
return t.transform(*this);
}
};
template < class R >
CGAL_KERNEL_CTOR_INLINE
PointC3<R CGAL_CTAG>::PointC3()
: Point_handle_3(Point_ref_3()) {}
template < class R >
CGAL_KERNEL_CTOR_INLINE
PointC3<R CGAL_CTAG>::PointC3(const Origin &)
: Point_handle_3(Point_ref_3(FT(0), FT(0), FT(0)) ) {}
template < class R >
CGAL_KERNEL_CTOR_INLINE
PointC3<R CGAL_CTAG>::PointC3(const typename PointC3<R CGAL_CTAG>::FT &x,
const typename PointC3<R CGAL_CTAG>::FT &y,
const typename PointC3<R CGAL_CTAG>::FT &z)
: Point_handle_3(Point_ref_3(x, y, z) ) {}
template < class R >
CGAL_KERNEL_CTOR_INLINE
PointC3<R CGAL_CTAG>::PointC3(const typename PointC3<R CGAL_CTAG>::FT &x,
const typename PointC3<R CGAL_CTAG>::FT &y,
const typename PointC3<R CGAL_CTAG>::FT &z,
const FT &w)
{
if (w != FT(1))
initialize_with(Point_ref_3(x/w, y/w, z/w) );
else
initialize_with(Point_ref_3(x, y, z) );
}
template < class R >
CGAL_KERNEL_CTOR_INLINE
PointC3<R CGAL_CTAG>::
PointC3(const typename PointC3<R CGAL_CTAG>::Vector_3 &v)
: Point_handle_3(v) {}
template < class R >
inline
typename PointC3<R CGAL_CTAG>::FT
@ -155,7 +136,7 @@ PointC3<R CGAL_CTAG>::cartesian(int i) const
// return (i==0) ? x() :
// (i==1) ? y() : z();
if (i==0) return x();
else if (i==1) return y();
if (i==1) return y();
return z();
}
@ -177,20 +158,11 @@ PointC3<R CGAL_CTAG>::homogeneous(int i) const
return FT(1);
}
template < class R >
inline
PointC3<R CGAL_CTAG>
PointC3<R CGAL_CTAG>::
transform(const typename PointC3<R CGAL_CTAG>::Aff_transformation_3 &t) const
{
return t.transform(*this);
}
template < class R >
Bbox_3
PointC3<R CGAL_CTAG>::bbox() const
{
// Not robust...
// FIXME: Not robust...
double bx = CGAL::to_double(x());
double by = CGAL::to_double(y());
double bz = CGAL::to_double(z());