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

Revert "Make the utilities public" 

This reverts commit 230c4aea14.
This commit is contained in:
Clement Jamin 2015-07-09 07:47:36 +02:00
parent 230c4aea14
commit 5d5b60d130
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Shape_base.h
View File

@ -117,42 +117,6 @@ namespace CGAL {
*/ */
virtual FT squared_distance(const Point_3 &p) const = 0; virtual FT squared_distance(const Point_3 &p) const = 0;
// --------------------------------------------------------------------------
// Utilities
// --------------------------------------------------------------------------
FT get_x(const Vector_3& v) const { return m_traits.compute_x_3_object()(v); }
FT get_y(const Vector_3& v) const { return m_traits.compute_y_3_object()(v); }
FT get_z(const Vector_3& v) const { return m_traits.compute_z_3_object()(v); }
FT get_x(const Point_3& p) const { return m_traits.compute_x_3_object()(p); }
FT get_y(const Point_3& p) const { return m_traits.compute_y_3_object()(p); }
FT get_z(const Point_3& p) const { return m_traits.compute_z_3_object()(p); }
Vector_3 constr_vec(const Point_3& p, const Point_3& q) const
{ return m_traits.construct_vector_3_object()(p, q); }
Vector_3 constr_vec(const Line_3& l) const
{ return m_traits.construct_vector_3_object()(l); }
Sphere_3 constr_sphere(const Point_3& c, FT r) const
{ return m_traits.construct_sphere_3_object()(c, r); }
Point_3 constr_point_on(const Line_3& l) const
{ return m_traits.construct_point_on_3_object()(l); }
FT sqlen(const Vector_3& v) const
{ return m_traits.compute_squared_length_3_object()(v); }
Vector_3 scale(const Vector_3& v, FT scale) const
{ return m_traits.construct_scaled_vector_3_object()(v, scale); }
Vector_3 sum_vectors(const Vector_3& u, const Vector_3& v) const
{ return m_traits.construct_sum_of_vectors_3_object()(u, v); }
Point_3 transl(const Point_3& p, const Vector_3 &v) const
{ return m_traits.construct_translated_point_3_object()(p, v); }
FT scalar_pdct(const Vector_3& u, const Vector_3& v) const
{ return m_traits.compute_scalar_product_3_object()(u, v); }
Vector_3 cross_pdct(const Vector_3& u, const Vector_3& v) const
{ return m_traits.compute_cross_product_3_object()(u, v); }
Point_3 sph_center(const Sphere_3& s) const
{ return m_traits.construct_center_3_object()(s); }
FT sqradius(const Sphere_3& s) const
{ return m_traits.compute_squared_radius_3_object()(s); }
protected: protected:
/*! /*!
@ -640,6 +604,43 @@ namespace CGAL {
return false; return false;
}; };
// --------------------------------------------------------------------------
// Utilities
// --------------------------------------------------------------------------
FT get_x(const Vector_3& v) const { return m_traits.compute_x_3_object()(v); }
FT get_y(const Vector_3& v) const { return m_traits.compute_y_3_object()(v); }
FT get_z(const Vector_3& v) const { return m_traits.compute_z_3_object()(v); }
FT get_x(const Point_3& p) const { return m_traits.compute_x_3_object()(p); }
FT get_y(const Point_3& p) const { return m_traits.compute_y_3_object()(p); }
FT get_z(const Point_3& p) const { return m_traits.compute_z_3_object()(p); }
Vector_3 constr_vec(const Point_3& p, const Point_3& q) const
{ return m_traits.construct_vector_3_object()(p, q); }
Vector_3 constr_vec(const Line_3& l) const
{ return m_traits.construct_vector_3_object()(l); }
Sphere_3 constr_sphere(const Point_3& c, FT r) const
{ return m_traits.construct_sphere_3_object()(c, r); }
Point_3 constr_point_on(const Line_3& l) const
{ return m_traits.construct_point_on_3_object()(l); }
FT sqlen(const Vector_3& v) const
{ return m_traits.compute_squared_length_3_object()(v); }
Vector_3 scale(const Vector_3& v, FT scale) const
{ return m_traits.construct_scaled_vector_3_object()(v, scale); }
Vector_3 sum_vectors(const Vector_3& u, const Vector_3& v) const
{ return m_traits.construct_sum_of_vectors_3_object()(u, v); }
Point_3 transl(const Point_3& p, const Vector_3 &v) const
{ return m_traits.construct_translated_point_3_object()(p, v); }
FT scalar_pdct(const Vector_3& u, const Vector_3& v) const
{ return m_traits.compute_scalar_product_3_object()(u, v); }
Vector_3 cross_pdct(const Vector_3& u, const Vector_3& v) const
{ return m_traits.compute_cross_product_3_object()(u, v); }
Point_3 sph_center(const Sphere_3& s) const
{ return m_traits.construct_center_3_object()(s); }
FT sqradius(const Sphere_3& s) const
{ return m_traits.compute_squared_radius_3_object()(s); }
protected: protected:
/// \endcond /// \endcond
// //