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

Enable different VPMs in PMP::clip

This commit is contained in:
Mael Rouxel-Labbé 2020-09-28 15:44:29 +02:00
parent cec2440297
commit 4d4eef94a4
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/clip.h
View File

@ -33,7 +33,14 @@
#include <boost/property_map/property_map.hpp> #include <boost/property_map/property_map.hpp>
#include <array>
#include <algorithm>
#include <map>
#include <set>
#include <type_traits>
#include <unordered_map> #include <unordered_map>
#include <utility>
#include <vector>
namespace CGAL{ namespace CGAL{
namespace Polygon_mesh_processing { namespace Polygon_mesh_processing {
@ -420,10 +427,9 @@ generic_clip_impl(
NamedParameters1>::type Vpm; NamedParameters1>::type Vpm;
typedef typename GetVertexPointMap<TriangleMesh, typedef typename GetVertexPointMap<TriangleMesh,
NamedParameters2>::type Vpm2; NamedParameters2>::type Vpm2;
CGAL_USE_TYPE(Vpm2);
CGAL_assertion_code( CGAL_static_assertion((std::is_same<typename boost::property_traits<Vpm>::value_type,
static const bool same_vpm = (boost::is_same<Vpm,Vpm2>::value); ) typename boost::property_traits<Vpm>::value_type>::value));
CGAL_static_assertion(same_vpm);
Vpm vpm1 = choose_parameter(get_parameter(np1, internal_np::vertex_point), Vpm vpm1 = choose_parameter(get_parameter(np1, internal_np::vertex_point),
get_property_map(boost::vertex_point, tm1)); get_property_map(boost::vertex_point, tm1));
@ -477,17 +483,17 @@ generic_clip_impl(
// surface intersection algorithm call // surface intersection algorithm call
typedef Corefinement::Generic_clip_output_builder<TriangleMesh, typedef Corefinement::Generic_clip_output_builder<TriangleMesh,
Vpm, Vpm, Vpm2,
Algo_ecm1, Algo_ecm1,
FaceIndexMap1, FaceIndexMap1,
Default> Ob; Default> Ob;
typedef Corefinement::Surface_intersection_visitor_for_corefinement< typedef Corefinement::Surface_intersection_visitor_for_corefinement<
TriangleMesh, Vpm, Ob, Ecm_in, User_visitor> Algo_visitor; TriangleMesh, Vpm, Vpm2, Ob, Ecm_in, User_visitor> Algo_visitor;
Ecm_in ecm_in(tm1,tm2,ecm1,ecm2); Ecm_in ecm_in(tm1,tm2,ecm1,ecm2);
Ob ob(tm1, tm2, vpm1, vpm2, algo_ecm1, fid_map1, use_compact_clipper); Ob ob(tm1, tm2, vpm1, vpm2, algo_ecm1, fid_map1, use_compact_clipper);
Corefinement::Intersection_of_triangle_meshes<TriangleMesh, Vpm, Algo_visitor > Corefinement::Intersection_of_triangle_meshes<TriangleMesh, Vpm, Vpm2, Algo_visitor >
functor(tm1, tm2, vpm1, vpm2, Algo_visitor(uv,ob,ecm_in,&tm2)); functor(tm1, tm2, vpm1, vpm2, Algo_visitor(uv,ob,ecm_in,&tm2));
functor(CGAL::Emptyset_iterator(), false, true); functor(CGAL::Emptyset_iterator(), false, true);
} }

15
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Generic_clip_output_builder.h
View File

@ -38,7 +38,8 @@ namespace PMP=Polygon_mesh_processing;
namespace params=PMP::parameters; namespace params=PMP::parameters;
template <class TriangleMesh, template <class TriangleMesh,
class VertexPointMap, class VertexPointMap1,
class VertexPointMap2,
class Ecm1, class Ecm1,
class FaceIdMap1, class FaceIdMap1,
class Kernel_=Default> class Kernel_=Default>
@ -48,7 +49,7 @@ class Generic_clip_output_builder
typedef typename Default::Get< typedef typename Default::Get<
Kernel_, Kernel_,
typename Kernel_traits< typename Kernel_traits<
typename boost::property_traits<VertexPointMap>::value_type typename boost::property_traits<VertexPointMap2>::value_type
>::Kernel >::type Kernel; >::Kernel >::type Kernel;
// graph_traits typedefs // graph_traits typedefs
@ -76,8 +77,8 @@ class Generic_clip_output_builder
//Data members //Data members
TriangleMesh &tm1, &tm2; TriangleMesh &tm1, &tm2;
// property maps of input meshes // property maps of input meshes
const VertexPointMap vpm1; const VertexPointMap1 vpm1;
const VertexPointMap vpm2; const VertexPointMap2 vpm2;
Ecm1 ecm1; Ecm1 ecm1;
FaceIdMap1 fids1; FaceIdMap1 fids1;
bool use_compact_clipper; bool use_compact_clipper;
@ -105,8 +106,8 @@ public:
Generic_clip_output_builder(TriangleMesh& tm1, Generic_clip_output_builder(TriangleMesh& tm1,
TriangleMesh& tm2, TriangleMesh& tm2,
const VertexPointMap vpm1, const VertexPointMap1 vpm1,
const VertexPointMap vpm2, const VertexPointMap2 vpm2,
const Ecm1& ecm1, const Ecm1& ecm1,
FaceIdMap1 fids1, FaceIdMap1 fids1,
bool use_compact_clipper) bool use_compact_clipper)
@ -167,7 +168,7 @@ public:
typedef Side_of_triangle_mesh<TriangleMesh, typedef Side_of_triangle_mesh<TriangleMesh,
Kernel, Kernel,
VertexPointMap> Inside_poly_test; VertexPointMap2> Inside_poly_test;
CGAL::Bounded_side in_tm2 = is_tm2_inside_out CGAL::Bounded_side in_tm2 = is_tm2_inside_out
? ON_UNBOUNDED_SIDE : ON_BOUNDED_SIDE; ? ON_UNBOUNDED_SIDE : ON_BOUNDED_SIDE;