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

facet_handle -> face_descriptor

This commit is contained in:
Sébastien Loriot 2014-06-05 21:29:01 +02:00
parent aec7e99e6a
commit d0dfac3caa
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h
View File

@ -61,12 +61,12 @@ template < class FaceGraph,
class AABB_face_graph_triangle_primitive class AABB_face_graph_triangle_primitive
#ifndef DOXYGEN_RUNNING #ifndef DOXYGEN_RUNNING
: public AABB_primitive<typename boost::graph_traits<FaceGraph>::face_descriptor, : public AABB_primitive<typename boost::graph_traits<FaceGraph>::face_descriptor,
Triangle_from_facet_handle_property_map< Triangle_from_face_descriptor_property_map<
FaceGraph, FaceGraph,
typename Default::Get<VertexPointPMap, typename Default::Get<VertexPointPMap,
typename boost::property_map< FaceGraph, typename boost::property_map< FaceGraph,
vertex_point_t>::type >::type>, vertex_point_t>::type >::type>,
One_point_from_facet_handle_property_map< One_point_from_face_descriptor_property_map<
FaceGraph, FaceGraph,
typename Default::Get<VertexPointPMap, typename Default::Get<VertexPointPMap,
typename boost::property_map< FaceGraph, typename boost::property_map< FaceGraph,
@ -78,8 +78,8 @@ class AABB_face_graph_triangle_primitive
typedef typename Default::Get<VertexPointPMap, typename boost::property_map< FaceGraph, vertex_point_t>::type >::type VertexPointPMap_; typedef typename Default::Get<VertexPointPMap, typename boost::property_map< FaceGraph, vertex_point_t>::type >::type VertexPointPMap_;
typedef typename boost::graph_traits<FaceGraph>::face_descriptor Id_; typedef typename boost::graph_traits<FaceGraph>::face_descriptor Id_;
typedef Triangle_from_facet_handle_property_map<FaceGraph,VertexPointPMap_> Triangle_property_map; typedef Triangle_from_face_descriptor_property_map<FaceGraph,VertexPointPMap_> Triangle_property_map;
typedef One_point_from_facet_handle_property_map<FaceGraph,VertexPointPMap_> Point_property_map; typedef One_point_from_face_descriptor_property_map<FaceGraph,VertexPointPMap_> Point_property_map;
typedef AABB_primitive< Id_, typedef AABB_primitive< Id_,
Triangle_property_map, Triangle_property_map,

20
Polyhedron/include/CGAL/Polyhedron_3_property_map.h
View File

@ -34,19 +34,19 @@ namespace CGAL{
//property map //property map
template <class FaceGraph, template <class FaceGraph,
class VertexPointPMap > class VertexPointPMap >
struct Triangle_from_facet_handle_property_map{ struct Triangle_from_face_descriptor_property_map{
typename boost::remove_const<FaceGraph>::type* m_graph; typename boost::remove_const<FaceGraph>::type* m_graph;
VertexPointPMap m_vppm; VertexPointPMap m_vppm;
Triangle_from_facet_handle_property_map() Triangle_from_face_descriptor_property_map()
{} {}
Triangle_from_facet_handle_property_map(FaceGraph* g) Triangle_from_face_descriptor_property_map(FaceGraph* g)
: m_graph( const_cast<typename boost::remove_const<FaceGraph>::type*>(g) ), : m_graph( const_cast<typename boost::remove_const<FaceGraph>::type*>(g) ),
m_vppm( get(vertex_point, *m_graph) ) m_vppm( get(vertex_point, *m_graph) )
{} {}
Triangle_from_facet_handle_property_map(FaceGraph* g, Triangle_from_face_descriptor_property_map(FaceGraph* g,
VertexPointPMap vppm ) VertexPointPMap vppm )
: m_graph(const_cast<typename boost::remove_const<FaceGraph>::type*>(g)), : m_graph(const_cast<typename boost::remove_const<FaceGraph>::type*>(g)),
m_vppm(vppm) m_vppm(vppm)
@ -64,8 +64,8 @@ struct Triangle_from_facet_handle_property_map{
//get function for property map //get function for property map
inline friend inline friend
Triangle_3 Triangle_3
get(const Triangle_from_facet_handle_property_map<FaceGraph,VertexPointPMap>& pmap, get(const Triangle_from_face_descriptor_property_map<FaceGraph,VertexPointPMap>& pmap,
typename Triangle_from_facet_handle_property_map<FaceGraph,VertexPointPMap>::key_type f) typename Triangle_from_face_descriptor_property_map<FaceGraph,VertexPointPMap>::key_type f)
{ {
typedef typename boost::property_traits< VertexPointPMap >::value_type Point_3; typedef typename boost::property_traits< VertexPointPMap >::value_type Point_3;
typedef typename Kernel_traits<Point_3>::Kernel::Triangle_3 Triangle_3; typedef typename Kernel_traits<Point_3>::Kernel::Triangle_3 Triangle_3;
@ -127,13 +127,13 @@ Segment_from_edge_descriptor_property_map(HalfedgeGraph* g)
//property map to access a point from a facet handle //property map to access a point from a facet handle
template <class FaceGraph, template <class FaceGraph,
class VertexPointPMap> class VertexPointPMap>
struct One_point_from_facet_handle_property_map{ struct One_point_from_face_descriptor_property_map{
One_point_from_facet_handle_property_map(FaceGraph* g = NULL) One_point_from_face_descriptor_property_map(FaceGraph* g = NULL)
: m_graph( const_cast<typename boost::remove_const<FaceGraph>::type*>(g) ) : m_graph( const_cast<typename boost::remove_const<FaceGraph>::type*>(g) )
{} {}
One_point_from_facet_handle_property_map(FaceGraph* g, VertexPointPMap vppm ) One_point_from_face_descriptor_property_map(FaceGraph* g, VertexPointPMap vppm )
: m_graph( const_cast<typename boost::remove_const<FaceGraph>::type*>(g) ), : m_graph( const_cast<typename boost::remove_const<FaceGraph>::type*>(g) ),
m_vppm(vppm) m_vppm(vppm)
{} {}
@ -150,7 +150,7 @@ struct One_point_from_facet_handle_property_map{
//get function for property map //get function for property map
inline friend inline friend
reference reference
get(const One_point_from_facet_handle_property_map<FaceGraph,VertexPointPMap>& m, get(const One_point_from_face_descriptor_property_map<FaceGraph,VertexPointPMap>& m,
key_type f) key_type f)
{ {
return get(m.m_vppm, target(halfedge(f, *m.m_graph), *m.m_graph)); return get(m.m_vppm, target(halfedge(f, *m.m_graph), *m.m_graph));