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

plug is-constrained edge maps

This commit is contained in:
Sébastien Loriot 2016-07-05 14:54:32 +02:00
parent 208526cc4e
commit dbf0f2de3d
2 changed files with 114 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h
View File

@ -160,7 +160,10 @@ difference(const TriangleMesh& tm1,
* @param tm2 second input triangulated surface mesh
* @param np1 optional sequence of \ref namedparameters among the ones listed below
* @param np2 optional sequence of \ref namedparameters among the ones listed below
*
* @param throw_on_self_intersection if `true`, for each input triangle mesh,
* the set of triangles closed to the intersection of `tm1` and `tm2` will be
* checked for self-intersection and `CGAL::Corefinement::Self_intersection_exception`
* will be thrown if at least one is found.
* \cgalNamedParamsBegin
* \cgalParamBegin{vertex_point_map} a property map with the points associated to the vertices of `tm1` (resp. `tm2`) \cgalParamEnd
* \cgalParamBegin{edge_is_constrained_map} a property map containing the
@ -175,32 +178,77 @@ difference(const TriangleMesh& tm1,
corefine(TriangleMesh& tm1,
TriangleMesh& tm2,
const NamedParameters1& np1,
const NamedParameters2& np2)
const NamedParameters2& np2,
const bool throw_on_self_intersection = false)
{
typedef typename GetVertexPointMap< TriangleMesh, NamedParameters1>::type Vpm;
Vpm vpm1 = choose_param(get_param(np1, vertex_point), get(vertex_point, tm1));
Vpm vpm2 = choose_param(get_param(np2, vertex_point), get(vertex_point, tm2));
// Vertex point maps
typedef typename GetVertexPointMap<TriangleMesh,
NamedParameters1>::const_type Vpm;
typedef typename GetVertexPointMap<TriangleMesh,
NamedParameters2>::const_type Vpm2;
CGAL_assertion_code(static const bool same_vpm = )
boost::is_same<Vpm,Vpm2>::value;
CGAL_static_assertion(same_vpm);
Vpm vpm1 = choose_pmap(get_param(np1, boost::vertex_point),
tm1,
vertex_point);
Vpm vpm2 = choose_pmap(get_param(np2, boost::vertex_point),
tm2,
vertex_point);
// Edge is-constrained maps
typedef typename boost::lookup_named_param_def <
CGAL::edge_is_constrained_t,
NamedParameters1,
Corefinement::No_mark<TriangleMesh>//default
> ::type Ecm1;
typedef typename boost::lookup_named_param_def <
CGAL::edge_is_constrained_t,
NamedParameters1,
Corefinement::No_mark<TriangleMesh>//default
> ::type Ecm2;
Ecm1 ecm1 = choose_param( get_param(np1, edge_is_constrained),
Corefinement::No_mark<TriangleMesh>() );
Ecm2 ecm2 = choose_param( get_param(np2, edge_is_constrained),
Corefinement::No_mark<TriangleMesh>() );
typedef Corefinement::Ecm_bind<TriangleMesh, Ecm1, Ecm2> Ecm;
// surface intersection algorithm call
typedef Corefinement::Default_node_visitor<TriangleMesh> Dnv;
typedef Corefinement::Default_face_visitor<TriangleMesh> Dfv;
typedef Corefinement::No_extra_output_from_corefinement<TriangleMesh> Ob;
typedef Corefinement::Visitor<TriangleMesh,Vpm> Visitor;
typedef Corefinement::Visitor<TriangleMesh,Vpm,Ob,Ecm> Visitor;
Dnv dnv;
Dfv dfv;
Ob ob;
Ecm ecm(tm1,tm2,ecm1,ecm2);
Corefinement::Intersection_of_triangle_meshes<TriangleMesh,Vpm,Visitor >
functor(tm1, tm2, vpm1, vpm2, Visitor(dnv,dfv,ob));
const bool throw_on_self_intersection = false; // TODO parameter???
functor(tm1, tm2, vpm1, vpm2, Visitor(dnv,dfv,ob,ecm));
functor(CGAL::Emptyset_iterator(), throw_on_self_intersection, true);
}
template <class TriangleMesh, class NamedParameters1>
void
corefine(TriangleMesh& tm1,
TriangleMesh& tm2,
const NamedParameters1& np1,
const bool throw_on_self_intersection = false)
{
using namespace CGAL::Polygon_mesh_processing::parameters;
corefine(tm1, tm2, np1, all_default(), throw_on_self_intersection);
}
template <class TriangleMesh>
void
corefine(TriangleMesh& tm1,
TriangleMesh& tm2)
TriangleMesh& tm2,
const bool throw_on_self_intersection = false)
{
using namespace CGAL::Polygon_mesh_processing::parameters;
corefine(tm1, tm2, all_default(), all_default());
corefine(tm1, tm2, all_default(), all_default(), throw_on_self_intersection);
}
} } // end of namespace CGAL::Polygon_mesh_processing

68
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Visitor.h
View File

@ -76,6 +76,51 @@ struct No_mark
{}
};
//binds two edge constrained pmaps
template <class G, class Ecm1, class Ecm2=Ecm1>
struct Ecm_bind{
G& g1;
const Ecm1& ecm1;
G& g2;
const Ecm2& ecm2;
Ecm_bind(G& g1, G& g2, const Ecm1& ecm1, const Ecm2& ecm2)
: g1(g1), ecm1(ecm1), g2(g2), ecm2(ecm2)
{}
typedef typename boost::graph_traits<G>::edge_descriptor edge_descriptor;
void put(G& g, edge_descriptor e, bool b) const
{
if ( &g==&g1 )
put(ecm1,e,b);
else
{
CGAL_assertion( &g==&g2 );
put(ecm2,e,b);
}
}
bool get(G& g, edge_descriptor e) const
{
if ( &g==&g1 )
return get(ecm1,e);
CGAL_assertion( &g==&g2 );
return get(ecm2,e);
}
};
template <class G>
struct Ecm_bind<G, No_mark<G>, No_mark<G> >
{
Ecm_bind(G&, G&, const No_mark<G>&, const No_mark<G>&){}
typedef typename boost::graph_traits<G>::edge_descriptor edge_descriptor;
void put(G&, edge_descriptor, bool) const {}
bool get(G& g, edge_descriptor e) const {
return false;
}
};
template<class G>
struct No_extra_output_from_corefinement
{
@ -96,13 +141,13 @@ struct No_extra_output_from_corefinement
template< class TriangleMesh,
class VertexPointMap,
class OutputBuilder_ = Default,
class EdgeMarkPropertyMap_ = Default,
class EdgeMarkMap_ = Default,
class NewNodeVisitor_ = Default,
class NewFaceVisitor_ = Default >
class Visitor{
//default template parameters
typedef typename Default::Get<EdgeMarkPropertyMap_,
No_mark<TriangleMesh> >::type EdgeMarkPropertyMap;
typedef typename Default::Get<EdgeMarkMap_,
Ecm_bind<TriangleMesh, No_mark<TriangleMesh> > >::type EdgeMarkMap;
typedef typename Default::Get<OutputBuilder_,
No_extra_output_from_corefinement<TriangleMesh> >::type OutputBuilder;
typedef typename Default::Get<
@ -172,12 +217,14 @@ private:
NewNodeVisitor& new_node_visitor;
NewFaceVisitor& new_face_visitor;
OutputBuilder& output_builder;
const EdgeMarkMap& m_edge_mark_map;
// visitor public functions
public:
Visitor(NewNodeVisitor& v, NewFaceVisitor& f, OutputBuilder& o)
Visitor(NewNodeVisitor& v, NewFaceVisitor& f, OutputBuilder& o, const EdgeMarkMap& emm)
: new_node_visitor(v)
, new_face_visitor(f)
, output_builder(o)
, m_edge_mark_map(emm)
{}
template<class Graph_node>
@ -515,9 +562,6 @@ void new_node_added(std::size_t node_id,
const VertexPointMap& vpm1,
const VertexPointMap& vpm2)
{
//TODO TMP
EdgeMarkPropertyMap m_edge_mark_pmap; // there should be one per mesh
TriangleMesh* tm1_ptr = const_cast<TriangleMesh*>(&tm1);
TriangleMesh* tm2_ptr = const_cast<TriangleMesh*>(&tm2);
@ -590,7 +634,7 @@ void new_node_added(std::size_t node_id,
}
std::pair<Node_id,Node_id> edge_pair(node_id,node_id_of_first);
if ( border_halfedges.insert( std::make_pair(hedge,edge_pair) ).second)
put(m_edge_mark_pmap,edge(hedge,tm),true);
m_edge_mark_map.put(tm,edge(hedge,tm),true);
set_edge_per_polyline(tm,edge_pair,hedge);
}
}
@ -658,7 +702,7 @@ void new_node_added(std::size_t node_id,
//We need an edge incident to the source vertex of hedge. This is the first opposite edge created.
bool first=true;
halfedge_descriptor hedge_incident_to_src=Graph_traits::null_halfedge();
bool hedge_is_marked = get(m_edge_mark_pmap,edge(hedge,tm));
bool hedge_is_marked = m_edge_mark_map.get(tm,edge(hedge,tm));
//do split the edges
CGAL_assertion_code(vertex_descriptor expected_src=source(hedge,tm));
BOOST_FOREACH(std::size_t node_id, node_ids)
@ -677,7 +721,7 @@ void new_node_added(std::size_t node_id,
//update marker tags. If the edge was marked, then the resulting edges in the split must be marked
if ( hedge_is_marked )
put(m_edge_mark_pmap,edge(hnew,tm),true);
m_edge_mark_map.put(tm,edge(hnew,tm),true);
CGAL_assertion_code(expected_src=vnew);
}
@ -904,7 +948,7 @@ void new_node_added(std::size_t node_id,
if( it_poly_hedge!=edge_to_hedge.end() ){
if ( border_halfedges.insert(
std::make_pair(it_poly_hedge->second,node_id_pair) ).second)
put(m_edge_mark_pmap,edge(it_poly_hedge->second,tm),true);
m_edge_mark_map.put(tm,edge(it_poly_hedge->second,tm),true);
set_edge_per_polyline(tm,node_id_pair,it_poly_hedge->second);
}
else{
@ -916,7 +960,7 @@ void new_node_added(std::size_t node_id,
if ( border_halfedges.insert(
std::make_pair(it_poly_hedge->second,opposite_pair) ).second )
put(m_edge_mark_pmap,edge(it_poly_hedge->second,tm),true);
m_edge_mark_map.put(tm,edge(it_poly_hedge->second,tm),true);
set_edge_per_polyline(tm,opposite_pair,it_poly_hedge->second);
}
}