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

Misc minor changes 

Some doc, some typos, some indentation...
This commit is contained in:
Mael Rouxel-Labbé 2016-11-09 14:11:30 +01:00
parent b17c60f4d8
commit 8da6683ef0
11 changed files with 68 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BGL/doc/BGL/BGL.txt
View File

@ -486,7 +486,7 @@ to the real border, and switch back on the "other side" of the seam.
in <em>(c)</em> the seam forms a closed polyline. While the first two define a single border, a cycle defines two borders
and splits the set of faces in two connected components. Something similar happens when the seam touches the same border
more than once. A seam can also connect different borders what changes the genus of the mesh.
Finally, a seam may have more than one connected components.
Finally, a seam may have more than one connected component.
\cgalFigureBegin{fig_Seam_mesh_2, Seam_mesh_2.png}
Walking around a seam <em>(a)</em> with no seam vertex on the real border,
@ -495,7 +495,7 @@ Walking around a seam <em>(a)</em> with no seam vertex on the real border,
Seam meshes are used in the Chapter \ref PkgSurfaceParameterizationSummary.
subsection BGLExamples Examples
\subsection BGLExamples Examples
\subsubsection BGLExampleIncidentVertices Example: Finding Incident Vertices in a HalfedgeGraph

26
BGL/include/CGAL/boost/graph/Seam_mesh.h
View File

@ -144,6 +144,7 @@ private:
mutable vertices_size_type number_of_vertices;
public:
/// Return the underlying mesh.
const TM& mesh() const
{
return tm;
@ -754,12 +755,27 @@ public:
/// @endcond
/// Return the number of seam edges in the seam mesh.
edges_size_type number_of_seam_edges() const
{
return number_of_seams;
}
/// Add seams to the mesh's property maps.
/// Set the number of seam edges.
void set_seam_edges_number(const edges_size_type sn) const
{
number_of_seams = sn;
}
/// Add seams to the property maps of the seam mesh.
///
/// In input, a seam edge is described by the pair of integers that correspond
/// to the indices of the extremeties (vertices) of the edge that one wishes
/// to mark as seam edge.
///
/// @pre filename should be the name of a CGAL selection file: seam edges
/// are given as pairs of integers, on the third line of the file
/// @pre A seam edge must be an edge of the graph
TM_halfedge_descriptor add_seams(const char* filename)
{
TM_halfedge_descriptor tmhd;
@ -828,16 +844,12 @@ public:
return tmhd;
}
void set_seam_number(const edges_size_type sn) const
{
number_of_seams = sn;
}
/// Constructs a seam mesh for a triangle mesh and an edge and vertex property map
///
/// \param tm the adapted mesh
/// \param sem the edge property map with value `true` for seam edges
/// \param svm the vertex property map with value `true` for seam vertices
///
/// @note the vertices must be exactly the vertices on the seam edges. Maybe a bad design.
Seam_mesh(const TM& tm_, const SEM& sem_, const SVM svm_)
: tm(tm_),

2
Documentation/doc/biblio/cgal_manual.bib
View File

@ -636,7 +636,7 @@ note = {\url{ttp://hal.inria.fr/inria-00090522}}
,year = 1995
,pages = {173--182}
,note = {Examples in
\url{tp://ftp.cs.washington.edu/pub/graphics}}
\url{ftp://ftp.cs.washington.edu/pub/graphics}}
,update = "97.08 kettner"
}

4
Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt
View File

@ -157,8 +157,8 @@ Left: Tutte barycentric mapping parameterization (the red line depicts the cut g
`Discrete_conformal_map_parameterizer_3<TriangleMesh, BorderParameterizer_3, SparseLinearAlgebraTraits_d>`
Discrete conformal map parameterization has been introduced by Eck et
al. to the graphics community \cgalCite{cgal:eddhls-maam-95}. It attempts to
Discrete conformal map parameterization has been introduced to the graphics community
by Eck et al. \cgalCite{cgal:eddhls-maam-95}. It attempts to
lower angle deformation by minimizing a discrete version of the
Dirichlet energy as derived by Pinkall and
Polthier \cgalCite{cgal:pp-cdmsc-93}. A one-to-one mapping is guaranteed

6
Surface_mesh_parameterization/include/CGAL/ARAP_parameterizer_3.h
View File

@ -282,9 +282,9 @@ private:
Vertex_set& vertices,
Faces_vector& faces) const
{
CGAL::internal::Parameterization::Containers_filler<TriangleMesh>
internal::Parameterization::Containers_filler<TriangleMesh>
fc(mesh, vertices, &faces);
CGAL::Polygon_mesh_processing::connected_component(
Polygon_mesh_processing::connected_component(
face(opposite(bhd, mesh), mesh),
mesh,
boost::make_function_output_iterator(fc));
@ -1361,7 +1361,7 @@ public:
output_uvmap("ARAP_final_pre_processing.off", mesh, vertices, faces, uvmap, vimap);
if(!internal::Parameterization::is_one_to_one_mapping(mesh, uvmap)){
if(!is_one_to_one_mapping(mesh, uvmap)) {
// Use post processing to handle flipped elements
std::cout << "Parameterization is not valid; calling post processor" << std::endl;
status = post_process(mesh, vertices, faces, bhd, uvmap, vimap);

4
Surface_mesh_parameterization/include/CGAL/Fixed_border_parameterizer_3.h
View File

@ -332,8 +332,8 @@ parameterize(TriangleMesh& mesh,
typedef boost::unordered_set<vertex_descriptor> Vertex_set;
Vertex_set vertices;
CGAL::internal::Parameterization::Containers_filler<TriangleMesh> fc(mesh, vertices);
CGAL::Polygon_mesh_processing::connected_component(
internal::Parameterization::Containers_filler<TriangleMesh> fc(mesh, vertices);
Polygon_mesh_processing::connected_component(
face(opposite(bhd, mesh), mesh),
mesh,
boost::make_function_output_iterator(fc));

4
Surface_mesh_parameterization/include/CGAL/IO/Surface_mesh_parameterization/File_off.h
View File

@ -108,8 +108,8 @@ void output_uvmap_to_off(const TriangleMesh& mesh,
boost::unordered_set<vertex_descriptor> vertices;
std::vector<face_descriptor> faces;
CGAL::internal::Parameterization::Containers_filler<TriangleMesh> fc(mesh, vertices, &faces);
CGAL::Polygon_mesh_processing::connected_component(
internal::Parameterization::Containers_filler<TriangleMesh> fc(mesh, vertices, &faces);
Polygon_mesh_processing::connected_component(
face(opposite(bhd, mesh), mesh),
mesh,
boost::make_function_output_iterator(fc));

4
Surface_mesh_parameterization/include/CGAL/LSCM_parameterizer_3.h
View File

@ -181,9 +181,9 @@ public:
boost::unordered_set<vertex_descriptor> ccvertices;
std::vector<face_descriptor> ccfaces;
CGAL::internal::Parameterization::Containers_filler<TriangleMesh>
internal::Parameterization::Containers_filler<TriangleMesh>
fc(mesh, ccvertices, &ccfaces);
CGAL::Polygon_mesh_processing::connected_component(
Polygon_mesh_processing::connected_component(
face(opposite(bhd, mesh), mesh),
mesh,
boost::make_function_output_iterator(fc));

2
Surface_mesh_parameterization/include/CGAL/MVC_post_processor_3.h
View File

@ -172,7 +172,7 @@ private:
const Vector& Xv,
const Vertex_set& vertices,
VertexUVMap uvmap,
const VertexIndexMap vimap)
const VertexIndexMap vimap) const
{
BOOST_FOREACH(vertex_descriptor vd, vertices){
int index = get(vimap, vd);