mirror of https://github.com/CGAL/cgal
Rename the builder class
This commit is contained in:
parent
205fcff141
commit
91c679234b
|
|
@ -21,7 +21,7 @@ using Mesh = CGAL::Surface_mesh<Point_3>;
|
||||||
using face_descriptor = boost::graph_traits<Mesh>::face_descriptor;
|
using face_descriptor = boost::graph_traits<Mesh>::face_descriptor;
|
||||||
|
|
||||||
using Oracle = CGAL::Alpha_wraps_3::internal::Triangle_mesh_oracle<Kernel>;
|
using Oracle = CGAL::Alpha_wraps_3::internal::Triangle_mesh_oracle<Kernel>;
|
||||||
using Dt = CGAL::Alpha_wraps_3::internal::Alpha_wrap_3<Oracle>::Triangulation;
|
using Dt = CGAL::Alpha_wraps_3::internal::Alpha_wrapper_3<Oracle>::Triangulation;
|
||||||
|
|
||||||
namespace PMP = CGAL::Polygon_mesh_processing;
|
namespace PMP = CGAL::Polygon_mesh_processing;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ int main(int argc, char** argv)
|
||||||
oracle.add_segment_soup(segments, CGAL::parameters::default_values());
|
oracle.add_segment_soup(segments, CGAL::parameters::default_values());
|
||||||
oracle.add_point_set(ps_points, CGAL::parameters::default_values());
|
oracle.add_point_set(ps_points, CGAL::parameters::default_values());
|
||||||
|
|
||||||
CGAL::Alpha_wraps_3::internal::Alpha_wrap_3<Oracle> aw3(oracle);
|
CGAL::Alpha_wraps_3::internal::Alpha_wrapper_3<Oracle> aw3(oracle);
|
||||||
|
|
||||||
Mesh wrap;
|
Mesh wrap;
|
||||||
aw3(alpha, offset, wrap);
|
aw3(alpha, offset, wrap);
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@ int main(int argc, char** argv)
|
||||||
t.reset();
|
t.reset();
|
||||||
|
|
||||||
using Oracle = CGAL::Alpha_wraps_3::internal::Triangle_mesh_oracle<K>;
|
using Oracle = CGAL::Alpha_wraps_3::internal::Triangle_mesh_oracle<K>;
|
||||||
using Wrapper = CGAL::Alpha_wraps_3::internal::Alpha_wrap_3<Oracle>;
|
using Wrapper = CGAL::Alpha_wraps_3::internal::Alpha_wrapper_3<Oracle>;
|
||||||
Wrapper wrapper; // contains the triangulation that is being refined iteratively
|
Wrapper wrapper; // contains the triangulation that is being refined iteratively
|
||||||
|
|
||||||
for(std::size_t i=0; i<relative_alphas.size(); ++i)
|
for(std::size_t i=0; i<relative_alphas.size(); ++i)
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ int main(int argc, char** argv)
|
||||||
Oracle oracle(K{});
|
Oracle oracle(K{});
|
||||||
oracle.add_triangle_soup(points, faces, CGAL::parameters::default_values());
|
oracle.add_triangle_soup(points, faces, CGAL::parameters::default_values());
|
||||||
|
|
||||||
CGAL::Alpha_wraps_3::internal::Alpha_wrap_3<Oracle, Delaunay_triangulation> aw3(oracle);
|
CGAL::Alpha_wraps_3::internal::Alpha_wrapper_3<Oracle, Delaunay_triangulation> aw3(oracle);
|
||||||
Mesh wrap;
|
Mesh wrap;
|
||||||
aw3(alpha, offset, wrap);
|
aw3(alpha, offset, wrap);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,7 @@ struct Wrapping_default_visitor
|
||||||
|
|
||||||
template <typename Oracle_,
|
template <typename Oracle_,
|
||||||
typename Triangulation_ = CGAL::Default>
|
typename Triangulation_ = CGAL::Default>
|
||||||
class Alpha_wrap_3
|
class Alpha_wrapper_3
|
||||||
{
|
{
|
||||||
using Oracle = Oracle_;
|
using Oracle = Oracle_;
|
||||||
|
|
||||||
|
|
@ -183,7 +183,7 @@ protected:
|
||||||
Alpha_PQ m_queue;
|
Alpha_PQ m_queue;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Alpha_wrap_3()
|
Alpha_wrapper_3()
|
||||||
#ifdef CGAL_AW3_USE_SORTED_PRIORITY_QUEUE
|
#ifdef CGAL_AW3_USE_SORTED_PRIORITY_QUEUE
|
||||||
// '4096' is an arbitrary, not-too-small value for the largest ID in queue initialization
|
// '4096' is an arbitrary, not-too-small value for the largest ID in queue initialization
|
||||||
: m_queue(4096)
|
: m_queue(4096)
|
||||||
|
|
@ -194,7 +194,7 @@ public:
|
||||||
static_assert(std::is_floating_point<FT>::value);
|
static_assert(std::is_floating_point<FT>::value);
|
||||||
}
|
}
|
||||||
|
|
||||||
Alpha_wrap_3(const Oracle& oracle)
|
Alpha_wrapper_3(const Oracle& oracle)
|
||||||
:
|
:
|
||||||
#ifdef CGAL_AW3_USE_SORTED_PRIORITY_QUEUE
|
#ifdef CGAL_AW3_USE_SORTED_PRIORITY_QUEUE
|
||||||
m_queue(4096),
|
m_queue(4096),
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@ void alpha_wrap_3(const PointRange& points,
|
||||||
using NP_helper = Point_set_processing_3_np_helper<PointRange, InputNamedParameters>;
|
using NP_helper = Point_set_processing_3_np_helper<PointRange, InputNamedParameters>;
|
||||||
using Geom_traits = typename NP_helper::Geom_traits;
|
using Geom_traits = typename NP_helper::Geom_traits;
|
||||||
using Oracle = Alpha_wraps_3::internal::Triangle_soup_oracle<Geom_traits>;
|
using Oracle = Alpha_wraps_3::internal::Triangle_soup_oracle<Geom_traits>;
|
||||||
using AW3 = Alpha_wraps_3::internal::Alpha_wrap_3<Oracle>;
|
using AW3 = Alpha_wraps_3::internal::Alpha_wrapper_3<Oracle>;
|
||||||
|
|
||||||
Geom_traits gt = choose_parameter<Geom_traits>(get_parameter(in_np, internal_np::geom_traits));
|
Geom_traits gt = choose_parameter<Geom_traits>(get_parameter(in_np, internal_np::geom_traits));
|
||||||
|
|
||||||
|
|
@ -254,7 +254,7 @@ void alpha_wrap_3(const TriangleMesh& tmesh,
|
||||||
|
|
||||||
using Geom_traits = typename GetGeomTraits<TriangleMesh, InputNamedParameters>::type;
|
using Geom_traits = typename GetGeomTraits<TriangleMesh, InputNamedParameters>::type;
|
||||||
using Oracle = Alpha_wraps_3::internal::Triangle_mesh_oracle<Geom_traits>;
|
using Oracle = Alpha_wraps_3::internal::Triangle_mesh_oracle<Geom_traits>;
|
||||||
using AW3 = Alpha_wraps_3::internal::Alpha_wrap_3<Oracle>;
|
using AW3 = Alpha_wraps_3::internal::Alpha_wrapper_3<Oracle>;
|
||||||
|
|
||||||
Geom_traits gt = choose_parameter<Geom_traits>(get_parameter(in_np, internal_np::geom_traits));
|
Geom_traits gt = choose_parameter<Geom_traits>(get_parameter(in_np, internal_np::geom_traits));
|
||||||
|
|
||||||
|
|
@ -350,7 +350,7 @@ void alpha_wrap_3(const PointRange& points,
|
||||||
using NP_helper = Point_set_processing_3_np_helper<PointRange, InputNamedParameters>;
|
using NP_helper = Point_set_processing_3_np_helper<PointRange, InputNamedParameters>;
|
||||||
using Geom_traits = typename NP_helper::Geom_traits;
|
using Geom_traits = typename NP_helper::Geom_traits;
|
||||||
using Oracle = Alpha_wraps_3::internal::Point_set_oracle<Geom_traits>;
|
using Oracle = Alpha_wraps_3::internal::Point_set_oracle<Geom_traits>;
|
||||||
using AW3 = Alpha_wraps_3::internal::Alpha_wrap_3<Oracle>;
|
using AW3 = Alpha_wraps_3::internal::Alpha_wrapper_3<Oracle>;
|
||||||
|
|
||||||
Geom_traits gt = choose_parameter<Geom_traits>(get_parameter(in_np, internal_np::geom_traits));
|
Geom_traits gt = choose_parameter<Geom_traits>(get_parameter(in_np, internal_np::geom_traits));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ void generate_random_seeds(const Oracle& oracle,
|
||||||
Seeds& seeds,
|
Seeds& seeds,
|
||||||
CGAL::Random& r)
|
CGAL::Random& r)
|
||||||
{
|
{
|
||||||
const auto bbox = CGAL::Alpha_wraps_3::internal::Alpha_wrap_3<Oracle>(oracle).construct_bbox(offset);
|
const auto bbox = CGAL::Alpha_wraps_3::internal::Alpha_wrapper_3<Oracle>(oracle).construct_bbox(offset);
|
||||||
const double sq_offset = CGAL::square(offset);
|
const double sq_offset = CGAL::square(offset);
|
||||||
|
|
||||||
while(seeds.size() < 3)
|
while(seeds.size() < 3)
|
||||||
|
|
@ -70,7 +70,7 @@ void alpha_wrap_triangle_mesh(Mesh& input_mesh,
|
||||||
|
|
||||||
Oracle oracle;
|
Oracle oracle;
|
||||||
oracle.add_triangle_mesh(input_mesh);
|
oracle.add_triangle_mesh(input_mesh);
|
||||||
AW3::internal::Alpha_wrap_3<Oracle> aw3(oracle);
|
AW3::internal::Alpha_wrapper_3<Oracle> aw3(oracle);
|
||||||
|
|
||||||
if(seeds.empty())
|
if(seeds.empty())
|
||||||
generate_random_seeds(oracle, offset, seeds, r);
|
generate_random_seeds(oracle, offset, seeds, r);
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ void alpha_wrap_triangle_soup(Points& pr,
|
||||||
// AW3
|
// AW3
|
||||||
Oracle oracle;
|
Oracle oracle;
|
||||||
oracle.add_triangle_soup(pr, fr);
|
oracle.add_triangle_soup(pr, fr);
|
||||||
AW3::internal::Alpha_wrap_3<Oracle> aw3(oracle);
|
AW3::internal::Alpha_wrapper_3<Oracle> aw3(oracle);
|
||||||
|
|
||||||
Mesh wrap;
|
Mesh wrap;
|
||||||
aw3(alpha, offset, wrap, CGAL::parameters::do_enforce_manifoldness(false));
|
aw3(alpha, offset, wrap, CGAL::parameters::do_enforce_manifoldness(false));
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
using TS_Oracle = CGAL::Alpha_wraps_3::internal::Triangle_soup_oracle<Kernel>;
|
using TS_Oracle = CGAL::Alpha_wraps_3::internal::Triangle_soup_oracle<Kernel>;
|
||||||
using SS_Oracle = CGAL::Alpha_wraps_3::internal::Segment_soup_oracle<Kernel, TS_Oracle>;
|
using SS_Oracle = CGAL::Alpha_wraps_3::internal::Segment_soup_oracle<Kernel, TS_Oracle>;
|
||||||
using Oracle = CGAL::Alpha_wraps_3::internal::Point_set_oracle<Kernel, SS_Oracle>;
|
using Oracle = CGAL::Alpha_wraps_3::internal::Point_set_oracle<Kernel, SS_Oracle>;
|
||||||
using Wrapper = CGAL::Alpha_wraps_3::internal::Alpha_wrap_3<Oracle>;
|
using Wrapper = CGAL::Alpha_wraps_3::internal::Alpha_wrapper_3<Oracle>;
|
||||||
|
|
||||||
// Here is the pipeline for the interruption box:
|
// Here is the pipeline for the interruption box:
|
||||||
// - The main window is connected to a wrapping thread, which performs the wrapping.
|
// - The main window is connected to a wrapping thread, which performs the wrapping.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue