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

Updated DepthSmooth to the recent library changes

This commit is contained in:
Paolo Cignoni 2009-03-20 00:27:07 +00:00
parent 42c90d1439
commit e6fe311c6d
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -814,11 +814,10 @@ static void VertexCoordViewDepth(MeshType &m,
const ScalarType alpha, const ScalarType alpha,
int step, bool SmoothBorder=false ) int step, bool SmoothBorder=false )
{ {
SimpleTempData<typename MeshType::VertContainer,LaplacianInfo > TD(m.vert);
LaplacianInfo lpz; LaplacianInfo lpz;
lpz.sum=CoordType(0,0,0); lpz.sum=CoordType(0,0,0);
lpz.cnt=0; lpz.cnt=0;
TD.Start(lpz); SimpleTempData<typename MeshType::VertContainer,LaplacianInfo > TD(m.vert,lpz);
for(int i=0;i<step;++i) for(int i=0;i<step;++i)
{ {
VertexIterator vi; VertexIterator vi;
@ -831,8 +830,8 @@ static void VertexCoordViewDepth(MeshType &m,
for(int j=0;j<3;++j) for(int j=0;j<3;++j)
if(!(*fi).IsB(j)) if(!(*fi).IsB(j))
{ {
TD[(*fi).V(j)].sum+=(*fi).V1(j)->Supervisor_P(); TD[(*fi).V(j)].sum+=(*fi).V1(j)->cP();
TD[(*fi).V1(j)].sum+=(*fi).V(j)->Supervisor_P(); TD[(*fi).V1(j)].sum+=(*fi).V(j)->cP();
++TD[(*fi).V(j)].cnt; ++TD[(*fi).V(j)].cnt;
++TD[(*fi).V1(j)].cnt; ++TD[(*fi).V1(j)].cnt;
} }
@ -854,8 +853,8 @@ static void VertexCoordViewDepth(MeshType &m,
for(int j=0;j<3;++j) for(int j=0;j<3;++j)
if((*fi).IsB(j)) if((*fi).IsB(j))
{ {
TD[(*fi).V(j)].sum+=(*fi).V1(j)->Supervisor_P(); TD[(*fi).V(j)].sum+=(*fi).V1(j)->cP();
TD[(*fi).V1(j)].sum+=(*fi).V(j)->Supervisor_P(); TD[(*fi).V1(j)].sum+=(*fi).V(j)->cP();
++TD[(*fi).V(j)].cnt; ++TD[(*fi).V(j)].cnt;
++TD[(*fi).V1(j)].cnt; ++TD[(*fi).V1(j)].cnt;
} }
@ -864,13 +863,11 @@ static void VertexCoordViewDepth(MeshType &m,
if(!(*vi).IsD() && TD[*vi].cnt>0 ) if(!(*vi).IsD() && TD[*vi].cnt>0 )
{ {
CoordType np = TD[*vi].sum/TD[*vi].cnt; CoordType np = TD[*vi].sum/TD[*vi].cnt;
CoordType d = (*vi).Supervisor_P() - viewpoint; d.Normalize(); CoordType d = (*vi).cP() - viewpoint; d.Normalize();
ScalarType s = d * ( np - (*vi).Supervisor_P() ); ScalarType s = d * ( np - (*vi).cP() );
(*vi).Supervisor_P() += d * (s*alpha); (*vi).P() += d * (s*alpha);
} }
} }
TD.Stop();
} }