diff --git a/src/meshlabplugins/filter_plymc/filter_plymc.cpp b/src/meshlabplugins/filter_plymc/filter_plymc.cpp index 58f91db06..433f9f946 100644 --- a/src/meshlabplugins/filter_plymc/filter_plymc.cpp +++ b/src/meshlabplugins/filter_plymc/filter_plymc.cpp @@ -147,7 +147,7 @@ bool PlyMCPlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSe tri::Append::Mesh(sm, mm->cm/*,false,p.VertSplatFlag*/); // note the last parameter of the append to prevent removal of unreferenced vertices... tri::UpdatePosition::Matrix(sm, mm->cm.Tr,true); tri::UpdateBounding::Box(sm); - tri::UpdateNormals::NormalizeVertex(sm); + tri::UpdateNormal::NormalizePerVertex(sm); //QString mshTmpPath=QDir::tempPath()+QString("/")+QString(mm->shortName())+QString(".vmi"); QString mshTmpPath=QString("__TMP")+QString(mm->shortName())+QString(".vmi"); qDebug("Saving tmp file %s",qPrintable(mshTmpPath)); diff --git a/src/meshlabplugins/filter_plymc/plymc.h b/src/meshlabplugins/filter_plymc/plymc.h index f435d398c..5afd3b88a 100644 --- a/src/meshlabplugins/filter_plymc/plymc.h +++ b/src/meshlabplugins/filter_plymc/plymc.h @@ -22,20 +22,14 @@ #include #include -//#include #include -#include #include -#include -#include -#include #include #include #include #include -#include #include #include #include @@ -203,7 +197,7 @@ bool InitMesh(SMesh &m, const char *filename, Matrix44f Tr) if(!(loadmask & tri::io::Mask::IOM_VERTQUALITY)) tri::UpdateQuality::VertexConstant(m,0); - tri::UpdateNormals::PerVertexMatrix(m,Tr); + tri::UpdateNormal::PerVertexMatrix(m,Tr); //if(!(loadmask & tri::io::Mask::IOM_VERTCOLOR)) // saveMask &= ~tri::io::Mask::IOM_VERTCOLOR; } @@ -215,7 +209,7 @@ bool InitMesh(SMesh &m, const char *filename, Matrix44f Tr) printf("Removed %i duplicates and %i unref",dup,unref); } - tri::UpdateNormals::PerVertexNormalizedPerFaceNormalized(m); + tri::UpdateNormal::PerVertexNormalizedPerFaceNormalized(m); if(p.GeodesicQualityFlag) { tri::UpdateTopology::VertexFace(m); tri::UpdateFlags::FaceBorderFromVF(m); diff --git a/src/meshlabplugins/filter_plymc/voxel.h b/src/meshlabplugins/filter_plymc/voxel.h index 4a3967b1f..ed44c77b2 100644 --- a/src/meshlabplugins/filter_plymc/voxel.h +++ b/src/meshlabplugins/filter_plymc/voxel.h @@ -163,7 +163,7 @@ public: const Color4b C4b() const { static Color4b cc; - cc.SetRGB(c[0],c[1],c[2]); + cc=Color4b(c[0],c[1],c[2],255); return cc; } inline void Blend( Voxelfc const & vx, scalar w)