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

- changed function names according to the new vcglib syntax

Browse Source 
(WARNING! edit_align still doesn't compile)
This commit is contained in:
Guido Ranzuglia granzuglia 2012-10-22 10:32:47 +00:00
parent 7975446fab
commit d00a28d3b5
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/meshlabplugins/edit_align/align/AlignPair.cpp
View File

@ -55,7 +55,7 @@ bool AlignPair::A2Mesh::InitVert(const Matrix44d &Tr,bool hasborderflag)
{
Matrix44d Idn; Idn.SetIdentity();
if(Tr!=Idn) tri::UpdatePosition<A2Mesh>::Matrix(*this,Tr);
tri::UpdateNormals<A2Mesh>::NormalizeVertex(*this);
tri::UpdateNormal<A2Mesh>::NormalizeVertex(*this);
tri::UpdateBounding<A2Mesh>::Box(*this);
return true;
}
@ -68,7 +68,7 @@ bool AlignPair::A2Mesh::Init(const Matrix44d &Tr,bool hasborderflag)
//int t2=clock();
if(Tr!=Idn) tri::UpdatePosition<A2Mesh>::Matrix(*this,Tr);
//int t3=clock();
tri::UpdateNormals<A2Mesh>::PerVertexNormalizedPerFaceNormalized(*this);
tri::UpdateNormal<A2Mesh>::PerVertexNormalizedPerFaceNormalized(*this);
//int t4=clock();
if(!hasborderflag)
tri::UpdateFlags<A2Mesh>::FaceBorderFromNone(*this);

15
src/meshlabplugins/edit_align/align/AlignPair.h
View File

@ -26,16 +26,16 @@
#include <vcg/math/histogram.h>
#include <vcg/math/matrix44.h>
#include <vcg/simplex/vertex/base.h>
#include <vcg/simplex/vertex/component.h>
#include <vcg/simplex/face/base.h>
#include <vcg/simplex/face/component.h>
#include <vcg/simplex/face/component_rt.h>
//#include <vcg/simplex/vertex/base.h>
//#include <vcg/simplex/vertex/component.h>
//#include <vcg/simplex/face/base.h>
//#include <vcg/simplex/face/component.h>
#include <vcg/simplex/face/component_ep.h>
#include <vcg/space/index/grid_static_ptr.h>
#include<vcg/complex/complex.h>
#include<vcg/complex/algorithms/update/normal.h>
#include<vcg/complex/algorithms/update/bounding.h>
#include<vcg/complex/algorithms/update/edges.h>
#include<vcg/complex/algorithms/update/component_ep.h>
namespace vcg
@ -302,7 +302,8 @@ void ConvertMesh(const MESH &M1, A2Mesh &M2)
assert((*f2i).V(0)-&M2.vert[0]>=0);
assert((*f2i).V(1)-&M2.vert[0] >=0);
assert((*f2i).V(2)-&M2.vert[0] >=0);
tri::UpdateEdges<A2Mesh>::Set(*f2i);
vcg::tri::UpdateEdges<vcg::AlignPair::A2Mesh>::Set(*f2i);
++f2i;
}
M2.vn=M1.vn;