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

use PMP internal function

This commit is contained in:
Sébastien Loriot 2015-07-16 16:40:54 +02:00
parent 25d5a69104
commit a30ad4be3c
5 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Polygon_mesh_processing/include/CGAL/internal/corefinement/Polyhedron_subset_extraction.h
View File

@ -1,41 +0,0 @@
// Copyright (c) 2011, 2015 GeometryFactory (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$
//
//
// Author(s) : Sebastien Loriot and Andreas Fabri
// temporarily needed so that Mean_curvature_skeleton test works with/without PMP
#ifndef CGAL_PMP_POLYHEDRON_SUBSET_EXTRACTION_H
#define CGAL_PMP_POLYHEDRON_SUBSET_EXTRACTION_H
#include <CGAL/Polygon_mesh_processing/connected_components.h>
namespace CGAL {
namespace internal {
template <typename Polyhedron,typename Output_iterator>
void extract_connected_components(const Polyhedron& P,Output_iterator out)
{
corefinement::extract_connected_components(P,out);
}
}
}
#endif // CGAL_PMP_POLYHEDRON_SUBSET_EXTRACTION_H

4
Polyhedron/demo/Polyhedron/Polyhedron_demo_mean_curvature_flow_skeleton_plugin.cpp
View File

@ -31,7 +31,7 @@
#include <CGAL/extract_mean_curvature_flow_skeleton.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/iterator.h>
#include <CGAL/internal/corefinement/Polyhedron_subset_extraction.h>
#include <CGAL/Polygon_mesh_processing/connected_components.h>
#include <CGAL/boost/graph/split_graph_into_polylines.h>
#include <CGAL/mesh_segmentation.h>
#include <CGAL/Polyhedron_copy_3.h>
@ -192,7 +192,7 @@ public:
// that has only one connected component
std::size_t num_component;
CGAL::Counting_output_iterator output_it(&num_component);
CGAL::internal::extract_connected_components(*pMesh, output_it);
CGAL::internal::corefinement::extract_connected_components(*pMesh, output_it);
++output_it;
if (num_component != 1)
{

4
Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/solver_benchmark.cpp
View File

@ -4,7 +4,7 @@
#include <CGAL/Eigen_solver_traits.h>
#include <CGAL/Mean_curvature_flow_skeletonization.h>
#include <CGAL/iterator.h>
#include <CGAL/internal/corefinement/Polyhedron_subset_extraction.h>
#include <CGAL/Polygon_mesh_processing/connected_components.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/Bbox_3.h>
@ -57,7 +57,7 @@ bool is_mesh_valid(Polyhedron& pMesh)
// that has only one connected component
std::size_t num_component;
CGAL::Counting_output_iterator output_it(&num_component);
CGAL::internal::extract_connected_components(pMesh, output_it);
CGAL::internal::corefinement::extract_connected_components(pMesh, output_it);
++output_it;
if (num_component != 1)
{

4
Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/MCF_Skeleton_test.cpp
View File

@ -2,7 +2,7 @@
#include <CGAL/Polyhedron_items_with_id_3.h>
#include <CGAL/Simple_cartesian.h>
#include <CGAL/Mean_curvature_flow_skeletonization.h>
#include <CGAL/internal/corefinement/Polyhedron_subset_extraction.h>
#include <CGAL/Polygon_mesh_processing/connected_components.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <fstream>
@ -39,7 +39,7 @@ bool is_mesh_valid(Polyhedron& pMesh)
// that has only one connected component
std::size_t num_component;
CGAL::Counting_output_iterator output_it(&num_component);
CGAL::internal::extract_connected_components(pMesh, output_it);
CGAL::internal::corefinement::extract_connected_components(pMesh, output_it);
++output_it;
if (num_component != 1)
{

4
Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/skeleton_connectivity_test.cpp
View File

@ -2,7 +2,7 @@
#include <CGAL/Polyhedron_items_with_id_3.h>
#include <CGAL/Simple_cartesian.h>
#include <CGAL/extract_mean_curvature_flow_skeleton.h>
#include <CGAL/internal/corefinement/Polyhedron_subset_extraction.h>
#include <CGAL/Polygon_mesh_processing/connected_components.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <boost/foreach.hpp>
@ -41,7 +41,7 @@ bool is_mesh_valid(Polyhedron& pMesh)
// that has only one connected component
std::size_t num_component;
CGAL::Counting_output_iterator output_it(&num_component);
CGAL::internal::extract_connected_components(pMesh, output_it);
CGAL::internal::corefinement::extract_connected_components(pMesh, output_it);
++output_it;
if (num_component != 1)
{