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

Misc minor code improvements

This commit is contained in:
Mael Rouxel-Labbé 2022-10-21 13:12:25 +02:00
parent 9189d4265a
commit a57dab7b0b
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Heat_method_3/include/CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h
View File

@ -92,8 +92,13 @@ public:
/*! /*!
\brief Constructor \brief Constructor
*/ */
Surface_mesh_geodesic_distances_3(const TriangleMesh& tm) Surface_mesh_geodesic_distances_3(const TriangleMesh& tm,
: vertex_id_map(get(Vertex_property_tag(),tm)), face_id_map(get(Face_property_tag(),tm)), v2v(tm), tm(tm), vpm(get(vertex_point,tm)) VertexPointMap vpm)
: vertex_id_map(get(Vertex_property_tag(), tm)),
face_id_map(get(Face_property_tag(), tm)),
v2v(tm),
tm(tm),
vpm(vpm)
{ {
build(); build();
} }
@ -101,8 +106,8 @@ public:
/*! /*!
\brief Constructor \brief Constructor
*/ */
Surface_mesh_geodesic_distances_3(const TriangleMesh& tm, VertexPointMap vpm) Surface_mesh_geodesic_distances_3(const TriangleMesh& tm)
: vertex_id_map(get(Vertex_property_tag(),tm)), face_id_map(get(Face_property_tag(),tm)), v2v(tm), tm(tm), vpm(vpm) : Surface_mesh_geodesic_distances_3(tm, get(vertex_point, tm))
{ {
build(); build();
} }

19
Heat_method_3/include/CGAL/Heat_method_3/internal/Intrinsic_Delaunay_triangulation_3.h
View File

@ -66,13 +66,16 @@ bool has_degenerate_faces(const TriangleMesh& tm, const Traits& traits)
typename Traits::Construct_cross_product_vector_3 typename Traits::Construct_cross_product_vector_3
cross_product = traits.construct_cross_product_vector_3_object(); cross_product = traits.construct_cross_product_vector_3_object();
typename boost::property_map< TriangleMesh, boost::vertex_point_t>::const_type typedef typename boost::property_map< TriangleMesh, boost::vertex_point_t>::const_type VPM;
vpm = get(boost::vertex_point, tm); typedef typename boost::property_traits<VPM>::reference Point_ref;
VPM vpm = get(boost::vertex_point, tm);
for (typename boost::graph_traits<TriangleMesh>::face_descriptor f : faces(tm)) for (typename boost::graph_traits<TriangleMesh>::face_descriptor f : faces(tm))
{ {
const Point p1 = get(vpm, target(halfedge(f, tm), tm)); const Point_ref p1 = get(vpm, target(halfedge(f, tm), tm));
const Point p2 = get(vpm, target(next(halfedge(f, tm), tm), tm)); const Point_ref p2 = get(vpm, target(next(halfedge(f, tm), tm), tm));
const Point p3 = get(vpm, target(next(next(halfedge(f, tm), tm), tm), tm)); const Point_ref p3 = get(vpm, target(next(next(halfedge(f, tm), tm), tm), tm));
Vector_3 v = cross_product(construct_vector(p1, p2), construct_vector(p1, p3)); Vector_3 v = cross_product(construct_vector(p1, p2), construct_vector(p1, p3));
if(scalar_product(v, v) == 0.) if(scalar_product(v, v) == 0.)
return true; return true;
@ -278,7 +281,7 @@ private:
} }
//returns true if edge is locally Delaunay (opposing angles are less than pi): //returns `true` if edge is locally Delaunay (opposing angles are less than pi):
//Two ways of doing this: taking angles directly (not good with virtual edges) //Two ways of doing this: taking angles directly (not good with virtual edges)
//OR: taking edge length and using law of cosines, //OR: taking edge length and using law of cosines,
//The second way checks cotan weights //The second way checks cotan weights
@ -797,11 +800,11 @@ struct IDT_vertex_distance_property_map {
friend void put(IDT_vertex_distance_property_map<IDT,PM> idtpm, friend void put(IDT_vertex_distance_property_map<IDT,PM> idtpm,
key_type vd, key_type vd,
value_type v) value_type val)
{ {
typename boost::graph_traits<TM>::vertex_descriptor tm_vd = target(vd.hd, idtpm.idt.triangle_mesh()); typename boost::graph_traits<TM>::vertex_descriptor tm_vd = target(vd.hd, idtpm.idt.triangle_mesh());
put(idtpm.pm, idtpm.idt.v2v.at(tm_vd), v); put(idtpm.pm, idtpm.idt.v2v.at(tm_vd), val);
} }
}; };