From 16b47e68c2a452a762558ed3411f0f88ef9a6c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 18 Jan 2022 10:12:19 +0100 Subject: [PATCH 1/6] Doxygen: Fixed duplicate doc --- src/OpenMesh/Tools/Decimater/CollapseInfoT.hh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/OpenMesh/Tools/Decimater/CollapseInfoT.hh b/src/OpenMesh/Tools/Decimater/CollapseInfoT.hh index 0af03a67..b4395d6d 100644 --- a/src/OpenMesh/Tools/Decimater/CollapseInfoT.hh +++ b/src/OpenMesh/Tools/Decimater/CollapseInfoT.hh @@ -73,15 +73,6 @@ namespace Decimater { template struct CollapseInfoT { public: - /** Initializing constructor. - * - * Given a mesh and a halfedge handle of the halfedge to be collapsed - * all important information of a halfedge collapse will be stored. - * \param _mesh Mesh source - * \param _heh Halfedge to collapse. The direction of the halfedge - * defines the direction of the collapse, i.e. the from-vertex - * will be removed and the to-vertex remains. - */ CollapseInfoT(Mesh& _mesh, typename Mesh::HalfedgeHandle _heh); Mesh& mesh; @@ -106,7 +97,11 @@ struct CollapseInfoT { //----------------------------------------------------------------------------- -/** +/** Initializing constructor. +* +* Given a mesh and a halfedge handle of the halfedge to be collapsed +* all important information of a halfedge collapse will be stored. +* * Local configuration of halfedge collapse to be stored in CollapseInfoT: * * vl @@ -124,6 +119,9 @@ struct CollapseInfoT { * * @param _mesh Reference to mesh * @param _heh The halfedge (v0 -> v1) defining the collapse +* The direction of the halfedge +* defines the direction of the collapse, i.e. the from-vertex +* will be removed and the to-vertex remains. */ template inline CollapseInfoT::CollapseInfoT(Mesh& _mesh, From 9ae17c00783fabb756912214c8c5c79ded2eea65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 18 Jan 2022 10:20:09 +0100 Subject: [PATCH 2/6] Fixed unknown paper type in doxygen file --- Doc/doxy.config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/doxy.config.in b/Doc/doxy.config.in index 1d0c47cd..73262caa 100644 --- a/Doc/doxy.config.in +++ b/Doc/doxy.config.in @@ -1807,7 +1807,7 @@ COMPACT_LATEX = NO # The default value is: a4. # This tag requires that the tag GENERATE_LATEX is set to YES. -PAPER_TYPE = a4wide +PAPER_TYPE = a4 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names # that should be included in the LaTeX output. The package can be specified just From f331ccc975a9565accb1506c036847b2ae15c79f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 18 Jan 2022 10:20:28 +0100 Subject: [PATCH 3/6] Fixed mismatching comment --- Doc/mesh.docu | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/mesh.docu b/Doc/mesh.docu index a506f300..22984d89 100644 --- a/Doc/mesh.docu +++ b/Doc/mesh.docu @@ -42,7 +42,7 @@ OpenMesh::PolyMeshT can use any kernel. to know what a mesh type has to offer refer to OpenMesh::Concepts::KernelT, OpenMesh::PolyMeshT, OpenMesh::TriMeshT. - */ +*/ //----------------------------------------------------------------------------- @@ -554,6 +554,7 @@ curvature, i.e. vertex color. \include mymesh.cc That's it. +*/ //----------------------------------------------------------------------------- @@ -635,7 +636,7 @@ provides the pubic member functions of \see OpenMesh::PolyMeshT \see OpenMesh::TriMeshT -**/ +*/ //----------------------------------------------------------------------------- @@ -989,7 +990,6 @@ for(; fh_it.is_valid(); ++fh_it) { \endcode - */ From 10426ff43dfdff2203b9fdaa34a6bb47839ddcde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 18 Jan 2022 10:20:45 +0100 Subject: [PATCH 4/6] Added missing parameter documentation --- src/OpenMesh/Core/Utils/BaseProperty.hh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/OpenMesh/Core/Utils/BaseProperty.hh b/src/OpenMesh/Core/Utils/BaseProperty.hh index d73bda44..8e9849af 100644 --- a/src/OpenMesh/Core/Utils/BaseProperty.hh +++ b/src/OpenMesh/Core/Utils/BaseProperty.hh @@ -79,6 +79,7 @@ public: /// flag with set_persistent(). /// /// \param _name Optional textual name for the property. + /// \param _internal_type_name Internal type name which will be used when storing the data in OM format /// BaseProperty(const std::string& _name = "", const std::string& _internal_type_name = "" ) : name_(_name), internal_type_name_(_internal_type_name), persistent_(false) From a00fd54c2e44720c183855f26139a99d38a4942e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 18 Jan 2022 10:29:31 +0100 Subject: [PATCH 5/6] Fixed link --- Doc/vdpm.docu | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Doc/vdpm.docu b/Doc/vdpm.docu index 5dd80bdd..24d9f1a5 100644 --- a/Doc/vdpm.docu +++ b/Doc/vdpm.docu @@ -2,11 +2,13 @@ /** \page vdpm_docu View Dependent Progressive Meshes - The VDPM software is based on "Truly Selective - Refinement of Progressive Meshes", J. Kim and S. Lee, In - Proc. Graphics Interface 2001. + + + The VDPM software is based on + +Truly Selective Refinement of Progressive Meshes, J. Kim and S. Lee , In Proc. Graphics Interface 2001 + The library is located in \c %OpenMesh/Tools/VDPM/ and in \c %OpenMesh/Apps/VDProgMesh/ are demo applications: -# \c mkbalancedpm creates balanced progressive meshes @@ -15,4 +17,4 @@ -# \c vdpmsynthezier is viewer for vdpm meshes. \todo Complete VDPM documentation. -*/ \ No newline at end of file +*/ From e9f693a01b99a9f6a86a5e82458522b1b27b5ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 18 Jan 2022 11:27:29 +0100 Subject: [PATCH 6/6] Removed unused variable --- src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh | 1 - 1 file changed, 1 deletion(-) diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh index 5a8dec53..870d3b0c 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh @@ -195,7 +195,6 @@ protected: { // This is an interpolating scheme, old vertices remain the same. - typename mesh_t::VertexIter initialVerticesEnd = _m.vertices_end(); for ( auto vh : _m.vertices()) _m.property( vp_pos_, vh ) = _m.point(vh);