diff --git a/apps/metro/mesh_type.h b/apps/metro/mesh_type.h index 5de90849..1da5b04d 100644 --- a/apps/metro/mesh_type.h +++ b/apps/metro/mesh_type.h @@ -44,7 +44,6 @@ just color and quality on the vertex #include // Vertex, Face, Mesh and Grid definitions. -#ifdef _PLUS_TYPES_ #include #include #include @@ -52,17 +51,8 @@ just color and quality on the vertex #include class MyEdge; class CFace; -class CVertex : public vcg::VertexSimp2 {}; +class CVertex : public vcg::VertexSimp2 {}; 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, std::vector > {}; -#else -#include -#include -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, std::vector > {}; -#endif #endif diff --git a/apps/metro/metro.cpp b/apps/metro/metro.cpp index 03190f59..c478a727 100644 --- a/apps/metro/metro.cpp +++ b/apps/metro/metro.cpp @@ -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::ply::PLYMask::PM_VERTCOLOR|vcg::ply::PLYMask::PM_VERTQUALITY; if(ColorMax!=0 || ColorMin != 0){ - vcg::tri::UpdateColor::VertexQuality(S1,ColorMin,ColorMax); - vcg::tri::UpdateColor::VertexQuality(S2,ColorMin,ColorMax); + vcg::tri::UpdateColor::VertexQualityRamp(S1,ColorMin,ColorMax); + vcg::tri::UpdateColor::VertexQualityRamp(S2,ColorMin,ColorMax); } tri::io::ExporterPLY::Save( S1,S1NewName.c_str(),true,p); tri::io::ExporterPLY::Save( S2,S2NewName.c_str(),true,p); diff --git a/apps/metro/sampling.h b/apps/metro/sampling.h index da43eb41..d1eeaf58 100644 --- a/apps/metro/sampling.h +++ b/apps/metro/sampling.h @@ -669,7 +669,7 @@ void Sampling::Hausdorff() // compute vertex colour if(Flags & SamplingFlags::SAVE_ERROR) - vcg::tri::UpdateColor::VertexQuality(S1); + vcg::tri::UpdateColor::VertexQualityRamp(S1); // compute statistics n_samples_per_area_unit = (double) n_total_samples / area_S1;