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

corrected CrossProdGradient( )

This commit is contained in:
Nico Pietroni 2005-11-23 16:24:44 +00:00
parent 5397953b4b
commit e463843198
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vcg/complex/trimesh/smooth.h
View File

@ -23,6 +23,9 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.3 2005/07/11 13:12:05 cignoni
small gcc-related compiling issues (typenames,ending cr, initialization order)
Revision 1.2 2005/03/16 16:14:12 spinelli Revision 1.2 2005/03/16 16:14:12 spinelli
aggiunta funzione PasoDobleSmooth e relative: aggiunta funzione PasoDobleSmooth e relative:
@ -565,7 +568,7 @@ void NormalSmooth(MESH_TYPE &m,
while (!ep.End()) while (!ep.End())
{ {
ep.f->ClearS(); ep.f->ClearS();
ep++; ++ep;
} }
} }
@ -594,7 +597,7 @@ void NormalSmooth(MESH_TYPE &m,
//TD[*(ep.f)]->SetV(); //TD[*(ep.f)]->SetV();
(*ep.f).SetS(); (*ep.f).SetS();
} }
ep++; ++ep;
} }
} }
mm.Normalize(); mm.Normalize();
@ -629,10 +632,11 @@ Point3<FLT> TriAreaGradient(Point3<FLT> &p,Point3<FLT> &p0,Point3<FLT> &p1)
} }
template <class FLT> template <class FLT>
Point3<FLT> CrossProdGradient(Point3<FLT> &p,Point3<FLT> &p0,Point3<FLT> &p1, Point3<FLT> &m) Point3<FLT> CrossProdGradient(Point3<FLT> &p, Point3<FLT> &p0, Point3<FLT> &p1, Point3<FLT> &m)
{ {
Point3<FLT> grad; Point3<FLT> grad;
p0-=p;
p1-=p;
grad[0] = (-p0[2] + p1[2])*m[1] + (-p1[1] + p0[1])*m[2]; grad[0] = (-p0[2] + p1[2])*m[1] + (-p1[1] + p0[1])*m[2];
grad[1] = (-p1[2] + p0[2])*m[0] + (-p0[0] + p1[0])*m[2]; grad[1] = (-p1[2] + p0[2])*m[0] + (-p0[0] + p1[0])*m[2];
grad[2] = (-p0[1] + p1[1])*m[0] + (-p1[0] + p0[0])*m[1]; grad[2] = (-p0[1] + p1[1])*m[0] + (-p1[0] + p0[0])*m[1];
@ -678,7 +682,7 @@ void FitMesh(MESH_TYPE &m,
while (!ep.End()) while (!ep.End())
{ {
ErrGrad+=FaceErrorGrad(ep.f->V(ep.z)->P(),ep.f->V1(ep.z)->P(),ep.f->V2(ep.z)->P(),TDF[ep.f].m); ErrGrad+=FaceErrorGrad(ep.f->V(ep.z)->P(),ep.f->V1(ep.z)->P(),ep.f->V2(ep.z)->P(),TDF[ep.f].m);
ep++; ++ep;
} }
TDV[*vi].np=(*vi).P()-ErrGrad*lambda; TDV[*vi].np=(*vi).P()-ErrGrad*lambda;
} }