Merge branch 'warnings' into 'master'
Warnings See merge request OpenMesh/OpenMesh!314
This commit is contained 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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@@ -2,10 +2,12 @@
|
||||
|
||||
/** \page vdpm_docu View Dependent Progressive Meshes
|
||||
|
||||
The VDPM software is based on <a
|
||||
href="http://www.postech.ac.kr/~leesy/ftp/gi01.pdf">"Truly Selective
|
||||
Refinement of Progressive Meshes", J. Kim and S. Lee, In
|
||||
Proc. Graphics Interface 2001</a>.
|
||||
|
||||
|
||||
|
||||
The VDPM software is based on
|
||||
|
||||
<a href="http://cg.postech.ac.kr/papers/gi01.pdf">Truly Selective Refinement of Progressive Meshes, J. Kim and S. Lee , In Proc. Graphics Interface 2001 </a>
|
||||
|
||||
The library is located in \c %OpenMesh/Tools/VDPM/ and in
|
||||
\c %OpenMesh/Apps/VDProgMesh/ are demo applications:
|
||||
|
||||
@@ -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 = "<unknown>", const std::string& _internal_type_name = "<unknown>" )
|
||||
: name_(_name), internal_type_name_(_internal_type_name), persistent_(false)
|
||||
|
||||
@@ -73,15 +73,6 @@ namespace Decimater {
|
||||
template<class Mesh>
|
||||
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<class Mesh>
|
||||
inline CollapseInfoT<Mesh>::CollapseInfoT(Mesh& _mesh,
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user