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

minor: local variable rename to avoid weird compilation problems.

This commit is contained in:
mtarini 2009-10-14 14:30:28 +00:00
parent c57e10951c
commit 1664791bf3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vcg/simplex/edge/distance.h
View File

@ -47,12 +47,12 @@ namespace vcg {
vcg::Segment3<typename EdgeType::ScalarType> s; vcg::Segment3<typename EdgeType::ScalarType> s;
s.P0()=e.V(0)->P(); s.P0()=e.V(0)->P();
s.P1()=e.V(1)->P(); s.P1()=e.V(1)->P();
typename EdgeType::CoordType near; typename EdgeType::CoordType nearest;
near=vcg::ClosestPoint<typename EdgeType::ScalarType>(s,q); nearest=vcg::ClosestPoint<typename EdgeType::ScalarType>(s,q);
typename EdgeType::ScalarType d=(q-near).Norm(); typename EdgeType::ScalarType d=(q-nearest).Norm();
if (d<dist){ if (d<dist){
dist=d; dist=d;
p=near; p=nearest;
return true; return true;
} }
else else
@ -71,7 +71,7 @@ namespace vcg {
const Point3<typename EDGETYPE::ScalarType> fp = Point3<typename EDGETYPE::ScalarType>::Construct(p); const Point3<typename EDGETYPE::ScalarType> fp = Point3<typename EDGETYPE::ScalarType>::Construct(p);
Point3<typename EDGETYPE::ScalarType> fq; Point3<typename EDGETYPE::ScalarType> fq;
typename EDGETYPE::ScalarType md = (typename EDGETYPE::ScalarType)(minDist); typename EDGETYPE::ScalarType md = (typename EDGETYPE::ScalarType)(minDist);
const bool ret = PointDistance(e, fp, md, fq); const bool ret = vcg::edge::PointDistance(e, fp, md, fq);
minDist = (SCALARTYPE)(md); minDist = (SCALARTYPE)(md);
q = Point3<SCALARTYPE>::Construct(fq); q = Point3<SCALARTYPE>::Construct(fq);
return (ret); return (ret);