lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-15 09:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

other few changes connected to the disappearing of the hated faceprojection flags...

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2011-12-13 14:45:48 +00:00
parent 665710069e
commit 6b8fa50873
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/meshlabplugins/filter_texture/filter_texture.cpp
View File

@ -816,7 +816,6 @@ bool FilterTexturePlugin::applyFilter(QAction *filter, MeshDocument &md, RichPar
// Rasterizing faces
srcMesh->updateDataMask(MeshModel::MM_FACEMARK);
tri::UpdateNormals<CMeshO>::PerFaceNormalized(srcMesh->cm);
tri::UpdateFlags<CMeshO>::FaceProjection(srcMesh->cm);
if (vertexSampling)
{
TransferColorSampler sampler(srcMesh->cm, img, upperbound,vertexMode); // color sampling
@ -888,7 +887,6 @@ bool FilterTexturePlugin::applyFilter(QAction *filter, MeshDocument &md, RichPar
srcMesh->updateDataMask(MeshModel::MM_FACEMARK);
tri::UpdateNormals<CMeshO>::PerFaceNormalized(srcMesh->cm);
tri::UpdateFlags<CMeshO>::FaceProjection(srcMesh->cm);
// Colorizing vertices
VertexSampler vs(srcMesh->cm, srcImg, upperbound);

6
src/meshlabplugins/filter_texture/rastering.h
View File

@ -77,11 +77,7 @@ public:
// Convert point to barycentric coords
vcg::Point3f interp;
int axis;
if (nearestF->Flags() & CMeshO::FaceType::NORMX ) axis = 0;
else if (nearestF->Flags() & CMeshO::FaceType::NORMY ) axis = 1;
else axis = 2;
bool ret = InterpolationParameters(*nearestF, axis, closestPt, interp);
bool ret = InterpolationParameters(*nearestF, nearestF->cN(), closestPt, interp);
assert(ret);
interp[2]=1.0-interp[1]-interp[0];

3
src/meshlabplugins/filter_zippering/filter_zippering.cpp
View File

@ -1519,10 +1519,8 @@ bool FilterZippering::applyFilter(QAction *filter, MeshDocument &md, RichParamet
tri::UnMarkAll(b->cm);
tri::UpdateNormals<CMeshO>::PerFaceNormalized(a->cm);
tri::UpdateFlags<CMeshO>::FaceProjection(a->cm);
tri::UpdateNormals<CMeshO>::PerVertexNormalized(a->cm);
tri::UpdateNormals<CMeshO>::PerFaceNormalized(b->cm);
tri::UpdateFlags<CMeshO>::FaceProjection(b->cm);
tri::UpdateNormals<CMeshO>::PerVertexNormalized(b->cm);
//fixed eps
eps = 0.00001f;
@ -1597,7 +1595,6 @@ bool FilterZippering::applyFilter(QAction *filter, MeshDocument &md, RichParamet
tri::UpdateTopology<CMeshO>::FaceFace(a->cm);
tri::UpdateFlags<CMeshO>::FaceClear(a->cm);
tri::UpdateNormals<CMeshO>::PerFaceNormalized(a->cm);
tri::UpdateFlags<CMeshO>::FaceProjection(a->cm);
tri::UpdateNormals<CMeshO>::PerVertexNormalized(a->cm);
//create grid on mesh A