mirror of https://github.com/CGAL/cgal
Reintroduce header with old name with deprecated message (breaking change)
This commit is contained in:
Simon Giraudot
parent
f05e93224a
commit
df91a87dba
|
|
@ -32,7 +32,6 @@
|
||||||
|
|
||||||
#include <CGAL/license/Point_set_shape_detection_3.h>
|
#include <CGAL/license/Point_set_shape_detection_3.h>
|
||||||
|
|
||||||
|
|
||||||
#include <CGAL/Shape_detection_3/Efficient_RANSAC.h>
|
#include <CGAL/Shape_detection_3/Efficient_RANSAC.h>
|
||||||
#include <CGAL/Shape_detection_3/Region_growing.h>
|
#include <CGAL/Shape_detection_3/Region_growing.h>
|
||||||
#include <CGAL/Shape_detection_3/Shape_detection_traits.h>
|
#include <CGAL/Shape_detection_3/Shape_detection_traits.h>
|
||||||
|
|
@ -43,4 +42,8 @@
|
||||||
#include <CGAL/Shape_detection_3/Sphere.h>
|
#include <CGAL/Shape_detection_3/Sphere.h>
|
||||||
#include <CGAL/Shape_detection_3/property_maps.h>
|
#include <CGAL/Shape_detection_3/property_maps.h>
|
||||||
|
|
||||||
|
#ifndef CGAL_NO_DEPRECATED_CODE
|
||||||
|
#include <CGAL/Shape_detection_3/Efficient_RANSAC_traits.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif //CGAL_SHAPE_DETECTION_3_H
|
#endif //CGAL_SHAPE_DETECTION_3_H
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,203 @@
|
||||||
|
// Copyright (c) 2015 INRIA Sophia-Antipolis (France).
|
||||||
|
// All rights reserved.
|
||||||
|
//
|
||||||
|
// This file is part of CGAL (www.cgal.org).
|
||||||
|
// You can redistribute it and/or modify it under the terms of the GNU
|
||||||
|
// General Public License as published by the Free Software Foundation,
|
||||||
|
// either version 3 of the License, or (at your option) any later version.
|
||||||
|
//
|
||||||
|
// Licensees holding a valid commercial license may use this file in
|
||||||
|
// accordance with the commercial license agreement provided with the software.
|
||||||
|
//
|
||||||
|
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
||||||
|
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
//
|
||||||
|
// $URL$
|
||||||
|
// $Id$
|
||||||
|
// SPDX-License-Identifier: GPL-3.0+
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// Author(s) : Sven Oesau, Yannick Verdie, Clément Jamin, Pierre Alliez
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef CGAL_SHAPE_DETECTION_3_EFFICIENT_RANSAC_TRAITS_H
|
||||||
|
#define CGAL_SHAPE_DETECTION_3_EFFICIENT_RANSAC_TRAITS_H
|
||||||
|
|
||||||
|
#include <CGAL/license/Point_set_shape_detection_3.h>
|
||||||
|
|
||||||
|
|
||||||
|
#include <CGAL/Search_traits_3.h>
|
||||||
|
|
||||||
|
/// \cond SKIP_IN_MANUAL
|
||||||
|
|
||||||
|
namespace CGAL {
|
||||||
|
namespace Shape_detection_3 {
|
||||||
|
/*!
|
||||||
|
\ingroup PkgPointSetShapeDetection3
|
||||||
|
\brief %Default traits class to use the shape detection class `Efficient_RANSAC`.
|
||||||
|
\cgalModels `Shape_detection_3::Traits`
|
||||||
|
|
||||||
|
\tparam Gt a model of the concept `#Kernel` with `Gt::FT` being `float` or `double`.
|
||||||
|
|
||||||
|
\tparam InputRange is a model of `Range` with random access iterators,
|
||||||
|
providing input points and normals through the following two property maps.
|
||||||
|
|
||||||
|
\tparam InputPointMap is a model of `ReadablePropertyMap` with `std::iterator_traits<Input_range::iterator>::%value_type` as key type and `Geom_traits::Point_3` as value type.
|
||||||
|
|
||||||
|
|
||||||
|
\tparam InputNormalMap is a model of `ReadablePropertyMap` with `std::iterator_traits<Input_range::iterator>::%value_type` as key type and `Geom_traits::Vector_3` as value type.
|
||||||
|
*/
|
||||||
|
template <class Gt,
|
||||||
|
class InputRange,
|
||||||
|
class InputPointMap,
|
||||||
|
class InputNormalMap>
|
||||||
|
struct
|
||||||
|
CGAL_DEPRECATED_MSG("CGAL::Shape_detection_3::Efficient_RANSAC_traits<> is now called CGAL::Shape_detection_3::Shape_detection_traits<>, please update your code")
|
||||||
|
Efficient_RANSAC_traits {
|
||||||
|
///
|
||||||
|
typedef typename Gt::FT FT;
|
||||||
|
///
|
||||||
|
typedef typename Gt::Point_3 Point_3;
|
||||||
|
///
|
||||||
|
typedef typename Gt::Vector_3 Vector_3;
|
||||||
|
///
|
||||||
|
typedef typename Gt::Sphere_3 Sphere_3;
|
||||||
|
///
|
||||||
|
typedef typename Gt::Segment_3 Segment_3;
|
||||||
|
///
|
||||||
|
typedef typename Gt::Line_3 Line_3;
|
||||||
|
///
|
||||||
|
typedef typename Gt::Circle_2 Circle_2;
|
||||||
|
///
|
||||||
|
typedef typename Gt::Plane_3 Plane_3;
|
||||||
|
///
|
||||||
|
typedef typename Gt::Point_2 Point_2;
|
||||||
|
///
|
||||||
|
typedef typename Gt::Vector_2 Vector_2;
|
||||||
|
///
|
||||||
|
typedef InputRange Input_range;
|
||||||
|
///
|
||||||
|
typedef InputPointMap Point_map;
|
||||||
|
///
|
||||||
|
typedef InputNormalMap Normal_map;
|
||||||
|
///
|
||||||
|
typedef CGAL::Search_traits_3<Gt> Search_traits;
|
||||||
|
///
|
||||||
|
Efficient_RANSAC_traits(const Gt& gt = Gt())
|
||||||
|
: m_gt(gt) {}
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_point_3 Construct_point_3;
|
||||||
|
Construct_point_3 construct_point_3_object() const
|
||||||
|
{ return m_gt.construct_point_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_vector_3 Construct_vector_3;
|
||||||
|
Construct_vector_3 construct_vector_3_object() const
|
||||||
|
{ return m_gt.construct_vector_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_point_2 Construct_point_2;
|
||||||
|
Construct_point_2 construct_point_2_object() const
|
||||||
|
{ return m_gt.construct_point_2_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_vector_2 Construct_vector_2;
|
||||||
|
Construct_vector_2 construct_vector_2_object() const
|
||||||
|
{ return m_gt.construct_vector_2_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_sphere_3 Construct_sphere_3;
|
||||||
|
Construct_sphere_3 construct_sphere_3_object() const
|
||||||
|
{ return m_gt.construct_sphere_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_line_3 Construct_line_3;
|
||||||
|
Construct_line_3 construct_line_3_object() const
|
||||||
|
{ return m_gt.construct_line_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_circle_2 Construct_circle_2;
|
||||||
|
Construct_circle_2 construct_circle_2_object() const
|
||||||
|
{ return m_gt.construct_circle_2_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_point_on_3 Construct_point_on_3;
|
||||||
|
Construct_point_on_3 construct_point_on_3_object() const
|
||||||
|
{ return m_gt.construct_point_on_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Compute_x_2 Compute_x_2;
|
||||||
|
Compute_x_2 compute_x_2_object() const
|
||||||
|
{ return m_gt.compute_x_2_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Compute_y_2 Compute_y_2;
|
||||||
|
Compute_y_2 compute_y_2_object() const
|
||||||
|
{ return m_gt.compute_y_2_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Compute_x_3 Compute_x_3;
|
||||||
|
Compute_x_3 compute_x_3_object() const
|
||||||
|
{ return m_gt.compute_x_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Compute_y_3 Compute_y_3;
|
||||||
|
Compute_y_3 compute_y_3_object() const
|
||||||
|
{ return m_gt.compute_y_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Compute_z_3 Compute_z_3;
|
||||||
|
Compute_z_3 compute_z_3_object() const
|
||||||
|
{ return m_gt.compute_z_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Compute_squared_length_3 Compute_squared_length_3;
|
||||||
|
Compute_squared_length_3 compute_squared_length_3_object() const
|
||||||
|
{ return m_gt.compute_squared_length_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Compute_squared_length_2 Compute_squared_length_2;
|
||||||
|
Compute_squared_length_2 compute_squared_length_2_object() const
|
||||||
|
{ return m_gt.compute_squared_length_2_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_scaled_vector_3 Construct_scaled_vector_3;
|
||||||
|
Construct_scaled_vector_3 construct_scaled_vector_3_object() const
|
||||||
|
{ return m_gt.construct_scaled_vector_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_sum_of_vectors_3 Construct_sum_of_vectors_3;
|
||||||
|
Construct_sum_of_vectors_3 construct_sum_of_vectors_3_object() const
|
||||||
|
{ return m_gt.construct_sum_of_vectors_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_translated_point_3 Construct_translated_point_3;
|
||||||
|
Construct_translated_point_3 construct_translated_point_3_object() const
|
||||||
|
{ return m_gt.construct_translated_point_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Compute_scalar_product_3 Compute_scalar_product_3;
|
||||||
|
Compute_scalar_product_3 compute_scalar_product_3_object() const
|
||||||
|
{ return m_gt.compute_scalar_product_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_cross_product_vector_3 Construct_cross_product_vector_3;
|
||||||
|
Construct_cross_product_vector_3 construct_cross_product_vector_3_object() const
|
||||||
|
{ return m_gt.construct_cross_product_vector_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_center_3 Construct_center_3;
|
||||||
|
Construct_center_3 construct_center_3_object() const
|
||||||
|
{ return m_gt.construct_center_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Construct_center_2 Construct_center_2;
|
||||||
|
Construct_center_2 construct_center_2_object() const
|
||||||
|
{ return m_gt.construct_center_2_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Compute_squared_radius_3 Compute_squared_radius_3;
|
||||||
|
Compute_squared_radius_3 compute_squared_radius_3_object() const
|
||||||
|
{ return m_gt.compute_squared_radius_3_object(); }
|
||||||
|
|
||||||
|
typedef typename Gt::Compute_squared_radius_2 Compute_squared_radius_2;
|
||||||
|
Compute_squared_radius_2 compute_squared_radius_2_object() const
|
||||||
|
{ 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(); }
|
||||||
|
|
||||||
|
///
|
||||||
|
typedef typename Gt::Intersect_3 Intersect_3;
|
||||||
|
///
|
||||||
|
Intersect_3 intersection_3_object() const
|
||||||
|
{ return m_gt.intersection_3_object(); }
|
||||||
|
|
||||||
|
private:
|
||||||
|
Gt m_gt;
|
||||||
|
};
|
||||||
|
|
||||||
|
} } // end of namespace CGAL::Shape_detection_3
|
||||||
|
|
||||||
|
/// \endcond
|
||||||
|
|
||||||
|
#endif // CGAL_SHAPE_DETECTION_3_EFFICIENT_RANSAC_TRAITS_H
|
||||||
Loading…
Reference in New Issue