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

properties_Polyhedron_3.h is now included by graph_traits_Polyhedron_3.h

This commit is contained in:
Sébastien Loriot 2014-07-04 14:57:47 +02:00
parent b7edce623f
commit 5f4813b64d
21 changed files with 2 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AABB_tree/demo/AABB_tree/Scene.h
View File

@ -12,7 +12,6 @@
#include <CGAL/AABB_tree.h>
#include <CGAL/AABB_traits.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <CGAL/AABB_halfedge_graph_segment_primitive.h>
#include <CGAL/AABB_face_graph_triangle_primitive.h>

1
AABB_tree/examples/AABB_tree/AABB_halfedge_graph_edge_example.cpp
View File

@ -7,7 +7,6 @@
#include <CGAL/AABB_traits.h>
#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <CGAL/AABB_halfedge_graph_segment_primitive.h>
#include <boost/iterator/transform_iterator.hpp>
#include <boost/bind.hpp>

1
AABB_tree/examples/AABB_tree/AABB_polyhedron_edge_example.cpp
View File

@ -8,7 +8,6 @@
#include <CGAL/Polyhedron_3.h>
#include <CGAL/AABB_halfedge_graph_segment_primitive.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
typedef CGAL::Simple_cartesian<double> K;
typedef K::FT FT;

1
AABB_tree/test/AABB_tree/aabb_any_all_benchmark.cpp
View File

@ -19,7 +19,6 @@
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <CGAL/Random.h>
#include <CGAL/point_generators_3.h>

1
BGL/examples/BGL_polyhedron_3/distance.cpp
View File

@ -3,7 +3,6 @@
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/Polyhedron_items_with_id_3.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <boost/graph/breadth_first_search.hpp>

1
BGL/examples/BGL_polyhedron_3/kruskal.cpp
View File

@ -2,7 +2,6 @@
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <iostream>
#include <list>

1
BGL/examples/BGL_polyhedron_3/kruskal_with_stored_id.cpp
View File

@ -3,7 +3,6 @@
#include <CGAL/Polyhedron_items_with_id_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <iostream>
#include <list>

2
BGL/examples/BGL_polyhedron_3/normals.cpp
View File

@ -13,8 +13,6 @@
#include <CGAL/Polyhedron_items_with_id_3.h>
// Graph traits adaptors
#include <CGAL/boost/graph/properties.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
typedef CGAL::Cartesian<double> Kernel;

1
BGL/examples/BGL_polyhedron_3/range.cpp
View File

@ -3,7 +3,6 @@
#include <CGAL/iterator_range.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <boost/foreach.hpp>

2
BGL/include/CGAL/boost/graph/graph_traits_Polyhedron_3.h
View File

@ -501,4 +501,6 @@ namespace boost {
#undef CGAL_HDS_PARAM_
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#endif // CGAL_BOOST_GRAPH_GRAPH_TRAITS_POLYHEDRON_3_H

2
BGL/test/BGL/graph_concept_Polyhedron_3.cpp
View File

@ -22,8 +22,6 @@
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/graph_concepts.h>
#include <CGAL/Polyhedron_items_with_id_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
typedef CGAL::Simple_cartesian<double> Kernel;
typedef CGAL::Polyhedron_3<Kernel, CGAL::Polyhedron_items_with_id_3> Polyhedron;

1
BGL/test/BGL/test_Prefix.h
View File

@ -14,7 +14,6 @@
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#ifdef CGAL_USE_SURFACE_MESH
#include <CGAL/Surface_mesh.h>

1
BGL/test/BGL/test_circulator.cpp
View File

@ -2,7 +2,6 @@
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <CGAL/boost/graph/iterator.h>
#include <boost/foreach.hpp>

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

@ -1,199 +0,0 @@
// Copyright (c) 2012 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
//
#ifndef CGAL_POLYHEDRON_SIMPLEX_PROPERTY_MAP_H
#define CGAL_POLYHEDRON_SIMPLEX_PROPERTY_MAP_H
#include <CGAL/property_map.h>
#include <boost/type_traits/is_const.hpp>
#include <boost/mpl/if.hpp>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <boost/type_traits/remove_const.hpp>
namespace CGAL{
//property map
template <class FaceGraph,
class VertexPointPMap >
struct Triangle_from_face_descriptor_property_map{
typename boost::remove_const<FaceGraph>::type* m_graph;
VertexPointPMap m_vppm;
Triangle_from_face_descriptor_property_map() : m_graph(NULL)
{}
Triangle_from_face_descriptor_property_map(FaceGraph* g)
: m_graph( const_cast<typename boost::remove_const<FaceGraph>::type*>(g) ),
m_vppm( get(vertex_point, *m_graph) )
{}
Triangle_from_face_descriptor_property_map(FaceGraph* g,
VertexPointPMap vppm )
: m_graph(const_cast<typename boost::remove_const<FaceGraph>::type*>(g)),
m_vppm(vppm)
{}
typedef typename boost::property_traits< VertexPointPMap >::value_type Point_3;
typedef typename Kernel_traits<Point_3>::Kernel::Triangle_3 Triangle_3;
//classical typedefs
typedef typename boost::graph_traits<FaceGraph>::face_descriptor key_type;
typedef Triangle_3 value_type;
typedef value_type reference;
typedef boost::readable_property_map_tag category;
//get function for property map
inline friend
Triangle_3
get(const Triangle_from_face_descriptor_property_map<FaceGraph,VertexPointPMap>& pmap,
typename Triangle_from_face_descriptor_property_map<FaceGraph,VertexPointPMap>::key_type f)
{
typedef typename boost::property_traits< VertexPointPMap >::value_type Point_3;
typedef typename Kernel_traits<Point_3>::Kernel::Triangle_3 Triangle_3;
typename boost::remove_const<FaceGraph>::type & g = *(pmap.m_graph);
CGAL_precondition(halfedge(f,g) == next(next(next(halfedge(f,g),g),g),g));
const Point_3& a = get(pmap.m_vppm, target(halfedge(f,g),g));
const Point_3& b = get(pmap.m_vppm, target(next(halfedge(f,g),g),g));
const Point_3& c = get(pmap.m_vppm,target(next(next(halfedge(f,g),g),g),g));
return Triangle_3(a,b,c);
}
};
template < class HalfedgeGraph,
class VertexPointPMap >
struct Segment_from_edge_descriptor_property_map{
Segment_from_edge_descriptor_property_map()
{}
Segment_from_edge_descriptor_property_map(HalfedgeGraph* g)
: m_graph( const_cast<typename boost::remove_const<HalfedgeGraph>::type*>(g) ),
m_vppm( get(vertex_point, *m_graph) )
{}
Segment_from_edge_descriptor_property_map(HalfedgeGraph* g,
VertexPointPMap vppm )
: m_graph( const_cast<typename boost::remove_const<HalfedgeGraph>::type*>(g) ),
m_vppm(vppm)
{}
//classical typedefs
typedef typename boost::property_traits< VertexPointPMap >::value_type Point;
typedef typename boost::graph_traits<HalfedgeGraph>::edge_descriptor key_type;
typedef typename Kernel_traits<Point>::Kernel::Segment_3 value_type;
typedef value_type reference;
typedef boost::readable_property_map_tag category;
//data
typename boost::remove_const<HalfedgeGraph>::type* m_graph;
VertexPointPMap m_vppm;
//get function for property map
inline friend
value_type
get(Segment_from_edge_descriptor_property_map<HalfedgeGraph,VertexPointPMap> pmap,
key_type h)
{
typedef typename boost::property_traits< VertexPointPMap >::value_type Point;
typedef typename Kernel_traits<Point>::Kernel::Segment_3 Segment_3;
return Segment_3(get(pmap.m_vppm, source(h, *pmap.m_graph) ),
get(pmap.m_vppm, target(h, *pmap.m_graph) ) );
}
};
//property map to access a point from a facet handle
template <class FaceGraph,
class VertexPointPMap>
struct One_point_from_face_descriptor_property_map{
One_point_from_face_descriptor_property_map(FaceGraph* g = NULL)
: m_graph( const_cast<typename boost::remove_const<FaceGraph>::type*>(g) )
{}
One_point_from_face_descriptor_property_map(FaceGraph* g, VertexPointPMap vppm )
: m_graph( const_cast<typename boost::remove_const<FaceGraph>::type*>(g) ),
m_vppm(vppm)
{}
typename boost::remove_const<FaceGraph>::type* m_graph;
VertexPointPMap m_vppm;
//classical typedefs
typedef typename boost::graph_traits<FaceGraph>::face_descriptor key_type;
typedef typename boost::property_traits< VertexPointPMap >::value_type value_type;
typedef typename boost::property_traits< VertexPointPMap >::reference reference;
typedef boost::lvalue_property_map_tag category;
//get function for property map
inline friend
reference
get(const One_point_from_face_descriptor_property_map<FaceGraph,VertexPointPMap>& m,
key_type f)
{
return get(m.m_vppm, target(halfedge(f, *m.m_graph), *m.m_graph));
}
};
//property map to access a point from an edge
template < class HalfedgeGraph,
class VertexPointPMap >
struct Source_point_from_edge_descriptor{
Source_point_from_edge_descriptor(
HalfedgeGraph* g = NULL ) :
m_graph( const_cast<typename boost::remove_const<HalfedgeGraph>::type*>(g) ),
m_vppm( get(vertex_point, *m_graph) )
{}
Source_point_from_edge_descriptor(
HalfedgeGraph* g,
VertexPointPMap vppm ) :
m_graph( const_cast<typename boost::remove_const<HalfedgeGraph>::type*>(g) ),
m_vppm(vppm)
{}
//classical typedefs
typedef typename boost::property_traits< VertexPointPMap >::value_type value_type;
typedef typename boost::property_traits< VertexPointPMap >::reference reference;
typedef typename boost::graph_traits<HalfedgeGraph>::edge_descriptor key_type;
typedef boost::readable_property_map_tag category;
//data
typename boost::remove_const<HalfedgeGraph>::type* m_graph;
VertexPointPMap m_vppm;
//get function for property map
inline friend
reference
get(Source_point_from_edge_descriptor<HalfedgeGraph,VertexPointPMap> pmap,
key_type h)
{
return get(vertex_point,
*pmap.m_graph,
source(h, *pmap.m_graph) );
}
};
} //namespace CGAL
#endif //CGAL_POLYHEDRON_SIMPLEX_PROPERTY_MAP_H

1
Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_constrain_sharp_edges.cpp
View File

@ -5,7 +5,6 @@
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <CGAL/Surface_mesh_simplification/edge_collapse.h>
#include <CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Constrained_placement.h>

1
Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_constrained_border_polyhedron.cpp
View File

@ -6,7 +6,6 @@
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
// Simplification function
#include <CGAL/Surface_mesh_simplification/edge_collapse.h>

1
Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_enriched_polyhedron.cpp
View File

@ -6,7 +6,6 @@
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
// Simplification function
#include <CGAL/Surface_mesh_simplification/edge_collapse.h>

1
Surface_mesh_simplification/examples/Surface_mesh_simplification/edge_collapse_polyhedron.cpp
View File

@ -5,7 +5,6 @@
#include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
// Simplification function
#include <CGAL/Surface_mesh_simplification/edge_collapse.h>

1
Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/HalfedgeGraph_Polyhedron_3.h
View File

@ -21,7 +21,6 @@
#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_HALFEDGEGRAPH_POLYHEDRON_3_H
// EOF //

1
Surface_mesh_simplification/test/Surface_mesh_simplification/basics.h
View File

@ -28,7 +28,6 @@ void Surface_simplification_external_trace( std::string s )
#include <CGAL/Polyhedron_3.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <CGAL/Surface_mesh_simplification/edge_collapse.h>
#include <CGAL/Surface_mesh_simplification/Edge_collapse_visitor_base.h>

1
Surface_mesh_simplification/test/Surface_mesh_simplification/edge_collapse_topology.cpp
View File

@ -6,7 +6,6 @@
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
// Simplification function
#include <CGAL/Surface_mesh_simplification/edge_collapse.h>