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

added check if length of segment is zero then function SegmentPointDistance still works

This commit is contained in:
Nico Pietroni 2012-05-25 13:32:48 +00:00
parent c469b5b948
commit d4ad0bd6f6
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vcg/space/distance3.h
View File

@ -227,13 +227,23 @@ void SegmentPointSquaredDistance( Segment3<ScalarType> s,
Point3< ScalarType > &closest, Point3< ScalarType > &closest,
ScalarType &sqr_dist) ScalarType &sqr_dist)
{ {
Point3<ScalarType> e = s.P1()-s.P0(); Point3<ScalarType> e = s.P1()-s.P0();
ScalarType t = ((p-s.P0())*e)/e.SquaredNorm(); ScalarType EPS=0.00000001;
if(t<0) t = 0; if (e.Norm()<EPS)
else if(t>1) t = 1; {
closest = s.P0()+e*t; Point3<ScalarType> AvP=(s.P0()+s.P1())/2.0;
sqr_dist = SquaredDistance(p,closest); closest=AvP;
assert(!math::IsNAN(sqr_dist)); sqr_dist=(AvP-p).Norm();
}
else
{
ScalarType t = ((p-s.P0())*e)/e.SquaredNorm();
if(t<0) t = 0;
else if(t>1) t = 1;
closest = s.P0()+e*t;
sqr_dist = SquaredDistance(p,closest);
assert(!math::IsNAN(sqr_dist));
}
} }
/* /*