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

The torus is working fine, now

This commit is contained in:
Clement Jamin 2015-07-10 09:08:07 +02:00
parent fbb6494658
commit bb5b745d98
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC_fake_traits_for_testing.h
View File

@ -131,17 +131,16 @@ namespace CGAL {
} }
}; };
struct Construct_point_3 /*struct Construct_point_3
{ {
Point_3 operator()() { return Point_3(); } Point_3 operator()() { return Point_3(); }
}; };
Construct_point_3 construct_point_3_object() const Construct_point_3 construct_point_3_object() const
{ return Construct_point_3(); } { return Construct_point_3(); }*/
struct Construct_point_2 struct Construct_point_2
{ {
Point_2 operator()() { return Point_2(); }
Point_2 operator()(FT a, FT b) { return Point_2(); } Point_2 operator()(FT a, FT b) { return Point_2(); }
}; };
Construct_point_2 construct_point_2_object() const Construct_point_2 construct_point_2_object() const
@ -292,11 +291,13 @@ namespace CGAL {
Construct_center_2 construct_center_2_object() const Construct_center_2 construct_center_2_object() const
{ return Construct_center_2(); } { return Construct_center_2(); }
/*struct Collinear_2 struct Collinear_2
{ result_type operator()(const Point_2& p, const Point_2& q, const Point_2& r) const {
{ return false; } }; bool operator()(const Point_2& p, const Point_2& q, const Point_2& r) const
Collinear_2 construct_collinear_2_object() const { return false; }
{ return Collinear_2(); }*/ };
Collinear_2 collinear_2_object() const
{ return Collinear_2(); }
/*struct Compute_squared_distance_3 /*struct Compute_squared_distance_3
{ FT operator()(Point_3 const&, Point_3 const&) const { return 0; } }; { FT operator()(Point_3 const&, Point_3 const&) const { return 0; } };

8
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC_traits.h
View File

@ -76,9 +76,9 @@ namespace CGAL {
Efficient_RANSAC_traits(const Gt& gt = Gt()) Efficient_RANSAC_traits(const Gt& gt = Gt())
: m_gt(gt) {} : m_gt(gt) {}
typedef typename Gt::Construct_point_3 Construct_point_3; /*typedef typename Gt::Construct_point_3 Construct_point_3;
Construct_point_3 construct_point_3_object() const Construct_point_3 construct_point_3_object() const
{ return m_gt.construct_point_3_object(); } { return m_gt.construct_point_3_object(); }*/
typedef typename Gt::Construct_vector_3 Construct_vector_3; typedef typename Gt::Construct_vector_3 Construct_vector_3;
Construct_vector_3 construct_vector_3_object() const Construct_vector_3 construct_vector_3_object() const
@ -172,6 +172,10 @@ namespace CGAL {
Compute_squared_radius_2 compute_squared_radius_2_object() const Compute_squared_radius_2 compute_squared_radius_2_object() const
{ return m_gt.compute_squared_radius_2_object(); } { return m_gt.compute_squared_radius_2_object(); }
typedef typename Gt::Collinear_2 Collinear_2;
Collinear_2 collinear_2_object() const
{ return m_gt.collinear_2_object(); }
private: private:
Gt m_gt; Gt m_gt;
}; };

2
Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Torus.h
View File

@ -155,7 +155,7 @@ namespace CGAL {
FT sqlen_2(const Vector_2& v) const FT sqlen_2(const Vector_2& v) const
{ return m_traits.compute_squared_length_2_object()(v); } { return m_traits.compute_squared_length_2_object()(v); }
bool collinear_2(const Point_2& p, const Point_2& q, const Point_2& r) const bool collinear_2(const Point_2& p, const Point_2& q, const Point_2& r) const
{ return m_traits.construct_collinear_2_object()(p, q, r); } { return m_traits.collinear_2_object()(p, q, r); }
void create_shape(const std::vector<std::size_t> &indices) { void create_shape(const std::vector<std::size_t> &indices) {
std::vector<Point_3> p; std::vector<Point_3> p;