manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated to comply mods at the lib 

(deprecated simplex definitions, new namespace "vertex", new vertexquality 
function names)
This commit is contained in:
ganovelli 2008-10-31 12:05:24 +00:00
parent dfc6417426
commit 6d59f7000a
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/metro/mesh_type.h
View File

@ -44,7 +44,6 @@ just color and quality on the vertex
#include <vcg/complex/trimesh/base.h> #include <vcg/complex/trimesh/base.h>
// Vertex, Face, Mesh and Grid definitions. // Vertex, Face, Mesh and Grid definitions.
#ifdef _PLUS_TYPES_
#include <vcg/simplex/vertexplus/base.h> #include <vcg/simplex/vertexplus/base.h>
#include <vcg/simplex/vertexplus/component.h> #include <vcg/simplex/vertexplus/component.h>
#include <vcg/simplex/faceplus/base.h> #include <vcg/simplex/faceplus/base.h>
@ -52,17 +51,8 @@ just color and quality on the vertex
#include <vcg/simplex/faceplus/component_rt.h> #include <vcg/simplex/faceplus/component_rt.h>
class MyEdge; class MyEdge;
class CFace; class CFace;
class CVertex : public vcg::VertexSimp2<CVertex,MyEdge,CFace,vcg::vert::Coord3d,vcg::vert::Qualityf,vcg::vert::Normal3d,vcg::vert::Color4b,vcg::vert::BitFlags> {}; class CVertex : public vcg::VertexSimp2<CVertex,MyEdge,CFace,vcg::vertex::Coord3d,vcg::vertex::Qualityf,vcg::vertex::Normal3d,vcg::vertex::Color4b,vcg::vertex::BitFlags> {};
class CFace : public vcg::FaceSimp2< CVertex,MyEdge,CFace,vcg::face::VertexRef, vcg::face::Normal3d, vcg::face::EdgePlane,vcg::face::Color4b,vcg::face::Mark,vcg::face::BitFlags> {}; class CFace : public vcg::FaceSimp2< CVertex,MyEdge,CFace,vcg::face::VertexRef, vcg::face::Normal3d, vcg::face::EdgePlane,vcg::face::Color4b,vcg::face::Mark,vcg::face::BitFlags> {};
class CMesh : public vcg::tri::TriMesh< std::vector<CVertex>, std::vector<CFace> > {}; class CMesh : public vcg::tri::TriMesh< std::vector<CVertex>, std::vector<CFace> > {};
#else
#include <vcg/simplex/vertex/with/vcvq.h>
#include <vcg/simplex/face/with/rtfcfmfn.h>
class MyEdge;
class CFace;
class CVertex : public vcg::VertexVCVQ< double,MyEdge,CFace > {};
class CFace : public vcg::FaceRTFCFMFN< CVertex,MyEdge,CFace > {};
class CMesh : public vcg::tri::TriMesh< std::vector<CVertex>, std::vector<CFace> > {};
#endif
#endif #endif

4
apps/metro/metro.cpp
View File

@ -353,8 +353,8 @@ int main(int argc, char**argv)
p.mask|=vcg::tri::io::Mask::IOM_VERTCOLOR | vcg::tri::io::Mask::IOM_VERTQUALITY /* | vcg::ply::PLYMask::PM_VERTQUALITY*/ ; p.mask|=vcg::tri::io::Mask::IOM_VERTCOLOR | vcg::tri::io::Mask::IOM_VERTQUALITY /* | vcg::ply::PLYMask::PM_VERTQUALITY*/ ;
//p.mask|=vcg::ply::PLYMask::PM_VERTCOLOR|vcg::ply::PLYMask::PM_VERTQUALITY; //p.mask|=vcg::ply::PLYMask::PM_VERTCOLOR|vcg::ply::PLYMask::PM_VERTQUALITY;
if(ColorMax!=0 || ColorMin != 0){ if(ColorMax!=0 || ColorMin != 0){
vcg::tri::UpdateColor<CMesh>::VertexQuality(S1,ColorMin,ColorMax); vcg::tri::UpdateColor<CMesh>::VertexQualityRamp(S1,ColorMin,ColorMax);
vcg::tri::UpdateColor<CMesh>::VertexQuality(S2,ColorMin,ColorMax); vcg::tri::UpdateColor<CMesh>::VertexQualityRamp(S2,ColorMin,ColorMax);
} }
tri::io::ExporterPLY<CMesh>::Save( S1,S1NewName.c_str(),true,p); tri::io::ExporterPLY<CMesh>::Save( S1,S1NewName.c_str(),true,p);
tri::io::ExporterPLY<CMesh>::Save( S2,S2NewName.c_str(),true,p); tri::io::ExporterPLY<CMesh>::Save( S2,S2NewName.c_str(),true,p);

2
apps/metro/sampling.h
View File

@ -669,7 +669,7 @@ void Sampling<MetroMesh>::Hausdorff()
// compute vertex colour // compute vertex colour
if(Flags & SamplingFlags::SAVE_ERROR) if(Flags & SamplingFlags::SAVE_ERROR)
vcg::tri::UpdateColor<MetroMesh>::VertexQuality(S1); vcg::tri::UpdateColor<MetroMesh>::VertexQualityRamp(S1);
// compute statistics // compute statistics
n_samples_per_area_unit = (double) n_total_samples / area_S1; n_samples_per_area_unit = (double) n_total_samples / area_S1;