Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix decimater module template parameter for Apps

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@646 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Matthias Möller
2012-08-08 14:04:23 +00:00
parent 1af3dcac53
commit d1213f23ea
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
View File

@@ -103,8 +103,8 @@ public:
typedef MeshViewerWidget inherited_t; typedef MeshViewerWidget inherited_t;
typedef Decimater::DecimaterT<mesh_t> decimater_t; typedef Decimater::DecimaterT<mesh_t> decimater_t;
typedef Decimater::ModQuadricT< decimater_t > mod_quadric_t; typedef Decimater::ModQuadricT< mesh_t > mod_quadric_t;
typedef Decimater::ModNormalFlippingT< decimater_t > mod_nf_t; typedef Decimater::ModNormalFlippingT< mesh_t > mod_nf_t;
// object types // object types
typedef std::auto_ptr< decimater_t > decimater_o; typedef std::auto_ptr< decimater_t > decimater_o;
@@ -149,11 +149,11 @@ public: // inherited
decimater_ = tmp; decimater_ = tmp;
} }
{ {
mod_quadric_o tmp( new mod_quadric_t( *decimater_ ) ); mod_quadric_o tmp( new mod_quadric_t( mesh() ) );
mod_quadric_ = tmp; mod_quadric_ = tmp;
} }
{ {
mod_nf_o tmp( new mod_nf_t ( *decimater_ ) ); mod_nf_o tmp( new mod_nf_t ( mesh() ) );
mod_nf_ = tmp; mod_nf_ = tmp;
} }

18
src/OpenMesh/Apps/Decimating/decimater.cc
View File

@@ -255,7 +255,7 @@ decimate(const std::string &_ifname,
typename OpenMesh::Decimater::ModAspectRatioT<DecimaterType>::Handle modAR; typename OpenMesh::Decimater::ModAspectRatioT<Mesh>::Handle modAR;
if (_opt.AR.is_enabled()) if (_opt.AR.is_enabled())
{ {
@@ -264,7 +264,7 @@ decimate(const std::string &_ifname,
decimater.module( modAR ).set_aspect_ratio( _opt.AR ) ; decimater.module( modAR ).set_aspect_ratio( _opt.AR ) ;
} }
typename OpenMesh::Decimater::ModEdgeLengthT<DecimaterType>::Handle modEL; typename OpenMesh::Decimater::ModEdgeLengthT<Mesh>::Handle modEL;
if (_opt.EL.is_enabled()) if (_opt.EL.is_enabled())
{ {
@@ -273,7 +273,7 @@ decimate(const std::string &_ifname,
decimater.module( modEL ).set_edge_length( _opt.EL ) ; decimater.module( modEL ).set_edge_length( _opt.EL ) ;
} }
typename OpenMesh::Decimater::ModHausdorffT <DecimaterType>::Handle modHD; typename OpenMesh::Decimater::ModHausdorffT <Mesh>::Handle modHD;
if (_opt.HD.is_enabled()) if (_opt.HD.is_enabled())
{ {
@@ -283,12 +283,12 @@ decimate(const std::string &_ifname,
} }
typename OpenMesh::Decimater::ModIndependentSetsT<DecimaterType>::Handle modIS; typename OpenMesh::Decimater::ModIndependentSetsT<Mesh>::Handle modIS;
if ( _opt.IS.is_enabled() ) if ( _opt.IS.is_enabled() )
decimater.add(modIS); decimater.add(modIS);
typename OpenMesh::Decimater::ModNormalDeviationT<DecimaterType>::Handle modND; typename OpenMesh::Decimater::ModNormalDeviationT<Mesh>::Handle modND;
if (_opt.ND.is_enabled()) if (_opt.ND.is_enabled())
{ {
@@ -297,7 +297,7 @@ decimate(const std::string &_ifname,
decimater.module( modND ).set_normal_deviation( _opt.ND ); decimater.module( modND ).set_normal_deviation( _opt.ND );
} }
typename OpenMesh::Decimater::ModNormalFlippingT<DecimaterType>::Handle modNF; typename OpenMesh::Decimater::ModNormalFlippingT<Mesh>::Handle modNF;
if (_opt.NF.is_enabled()) if (_opt.NF.is_enabled())
{ {
@@ -307,12 +307,12 @@ decimate(const std::string &_ifname,
} }
typename OpenMesh::Decimater::ModProgMeshT<DecimaterType>::Handle modPM; typename OpenMesh::Decimater::ModProgMeshT<Mesh>::Handle modPM;
if ( _opt.PM.is_enabled() ) if ( _opt.PM.is_enabled() )
decimater.add(modPM); decimater.add(modPM);
typename OpenMesh::Decimater::ModQuadricT<DecimaterType>::Handle modQ; typename OpenMesh::Decimater::ModQuadricT<Mesh>::Handle modQ;
if (_opt.Q.is_enabled()) if (_opt.Q.is_enabled())
{ {
@@ -321,7 +321,7 @@ decimate(const std::string &_ifname,
decimater.module( modQ ).set_max_err( _opt.Q ); decimater.module( modQ ).set_max_err( _opt.Q );
} }
typename OpenMesh::Decimater::ModRoundnessT<DecimaterType>::Handle modR; typename OpenMesh::Decimater::ModRoundnessT<Mesh>::Handle modR;
if ( _opt.R.is_enabled() ) if ( _opt.R.is_enabled() )
{ {

10
src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc
View File

@@ -57,10 +57,10 @@
typedef OpenMesh::TriMesh_ArrayKernelT<> Mesh; typedef OpenMesh::TriMesh_ArrayKernelT<> Mesh;
typedef OpenMesh::Decimater::DecimaterT<Mesh> DecimaterProgMesh; typedef OpenMesh::Decimater::DecimaterT<Mesh> DecimaterProgMesh;
typedef OpenMesh::Decimater::ModNormalFlippingT<DecimaterProgMesh> ModNormalFlipping; typedef OpenMesh::Decimater::ModNormalFlippingT<Mesh> ModNormalFlipping;
typedef OpenMesh::Decimater::ModQuadricT<DecimaterProgMesh> ModQuadric; typedef OpenMesh::Decimater::ModQuadricT<Mesh> ModQuadric;
typedef OpenMesh::Decimater::ModProgMeshT<DecimaterProgMesh> ModProgMesh; typedef OpenMesh::Decimater::ModProgMeshT<Mesh> ModProgMesh;
typedef OpenMesh::Decimater::ModIndependentSetsT<DecimaterProgMesh> ModIndependentSets; typedef OpenMesh::Decimater::ModIndependentSetsT<Mesh> ModIndependentSets;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -168,7 +168,7 @@ private:
template <typename D> template <typename D>
const double ModBalancerT<D>::inv_log2_ = 1.0/std::log(2.0); const double ModBalancerT<D>::inv_log2_ = 1.0/std::log(2.0);
typedef ModBalancerT<DecimaterProgMesh> ModBalancer; typedef ModBalancerT<Mesh> ModBalancer;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------