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

Merge pull request #3937 from sloriot/Slicer-fix_default_vpm 

Fix default vertex point map
This commit is contained in:
Laurent Rineau 2019-06-17 13:51:38 +02:00
parent 1af9a8030e dd84321f56
commit 19e1dd8c3f
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AABB_tree/doc/AABB_tree/PackageDescription.txt
View File

@ -36,6 +36,6 @@
- `CGAL::AABB_triangle_primitive<GeomTraits, Iterator, CacheDatum>` - `CGAL::AABB_triangle_primitive<GeomTraits, Iterator, CacheDatum>`
- `CGAL::AABB_segment_primitive<GeomTraits, Iterator, CacheDatum>` - `CGAL::AABB_segment_primitive<GeomTraits, Iterator, CacheDatum>`
- `CGAL::AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>` - `CGAL::AABB_primitive<Id,ObjectPropertyMap,PointPropertyMapPolyhedron,ExternalPropertyMaps,CacheDatum>`
- `CGAL::AABB_halfedge_graph_segment_primitive<HalfedgeGraph,OneHalfedgeGraphPerTree,CacheDatum>` - `CGAL::AABB_halfedge_graph_segment_primitive<HalfedgeGraph,Vpm,OneHalfedgeGraphPerTree,CacheDatum>`
- `CGAL::AABB_face_graph_triangle_primitive<FaceGraph,OneFaceGraphPerTree,CacheDatum>` - `CGAL::AABB_face_graph_triangle_primitive<FaceGraph,Vpm,OneFaceGraphPerTree,CacheDatum>`
*/ */

13
Polygon_mesh_processing/include/CGAL/Polygon_mesh_slicer.h
View File

@ -39,6 +39,8 @@
#include <CGAL/Polygon_mesh_processing/internal/Polygon_mesh_slicer/Axis_parallel_plane_traits.h> #include <CGAL/Polygon_mesh_processing/internal/Polygon_mesh_slicer/Axis_parallel_plane_traits.h>
#include <boost/variant.hpp> #include <boost/variant.hpp>
#include <boost/mpl/if.hpp>
#include <boost/type_traits/is_same.hpp>
#include <CGAL/boost/graph/split_graph_into_polylines.h> #include <CGAL/boost/graph/split_graph_into_polylines.h>
#include <CGAL/boost/graph/helpers.h> #include <CGAL/boost/graph/helpers.h>
@ -86,7 +88,13 @@ template<class TriangleMesh,
class VertexPointMap = typename boost::property_map< TriangleMesh, vertex_point_t>::type, class VertexPointMap = typename boost::property_map< TriangleMesh, vertex_point_t>::type,
class AABBTree = AABB_tree< class AABBTree = AABB_tree<
AABB_traits<Traits, AABB_traits<Traits,
AABB_halfedge_graph_segment_primitive<TriangleMesh> > >, AABB_halfedge_graph_segment_primitive<TriangleMesh,
typename boost::mpl::if_<
typename boost::is_same<
VertexPointMap,
typename boost::property_map< TriangleMesh, vertex_point_t>::type >::type,
Default,
VertexPointMap>::type> > >,
bool UseParallelPlaneOptimization=true> bool UseParallelPlaneOptimization=true>
class Polygon_mesh_slicer class Polygon_mesh_slicer
{ {
@ -393,6 +401,9 @@ class Polygon_mesh_slicer
public: public:
/// the AABB-tree type used internally
typedef AABBTree AABB_tree;
/** /**
* Constructor using `edges(tmesh)` to initialize the * Constructor using `edges(tmesh)` to initialize the
* internal `AABB_tree`. * internal `AABB_tree`.