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

Corrected nasty bug in the newest version of the point-face distance, now the two versions are quite coherent

This commit is contained in:
Paolo Cignoni 2008-06-13 06:03:27 +00:00
parent 2ff77479af
commit 3779f19eee
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vcg/simplex/face/distance.h
View File

@ -263,6 +263,7 @@ namespace vcg {
vcg::Point3<typename FaceType::ScalarType> & p ) vcg::Point3<typename FaceType::ScalarType> & p )
{ {
typedef typename FaceType::ScalarType ScalarType; typedef typename FaceType::ScalarType ScalarType;
// assert(f.cN().SquaredNorm() > 0.9999 && f.cN().SquaredNorm()<1.0001);
Plane3<ScalarType> fPlane; Plane3<ScalarType> fPlane;
fPlane.Init(f.cP(0),f.cN()); fPlane.Init(f.cP(0),f.cN());
const ScalarType EPSILON = ScalarType( 0.000001); const ScalarType EPSILON = ScalarType( 0.000001);
@ -305,7 +306,7 @@ namespace vcg {
{ {
case FaceType::NORMX: case FaceType::NORMX:
scaleFactor= 1/fPlane.Direction()[0]; scaleFactor= 1/fPlane.Direction()[0];
fEdge[0]*=d; fEdge[1]*=d;fEdge[2]*=d; fEdge[0]*=scaleFactor; fEdge[1]*=scaleFactor; fEdge[2]*=scaleFactor;
b0 = fEdge[1][1]*(p[2] - f.cP(1)[2]) - fEdge[1][2]*(p[1] - f.cP(1)[1]); b0 = fEdge[1][1]*(p[2] - f.cP(1)[2]) - fEdge[1][2]*(p[1] - f.cP(1)[1]);
if(b0<=0) if(b0<=0)
@ -349,7 +350,7 @@ namespace vcg {
case FaceType::NORMY: case FaceType::NORMY:
scaleFactor= 1/fPlane.Direction()[1]; scaleFactor= 1/fPlane.Direction()[1];
fEdge[0]*=d; fEdge[1]*=d;fEdge[2]*=d; fEdge[0]*=scaleFactor; fEdge[1]*=scaleFactor; fEdge[2]*=scaleFactor;
b0 = fEdge[1][2]*(p[0] - f.cP(1)[0]) - fEdge[1][0]*(p[2] - f.cP(1)[2]); b0 = fEdge[1][2]*(p[0] - f.cP(1)[0]) - fEdge[1][0]*(p[2] - f.cP(1)[2]);
if(b0<=0) if(b0<=0)
@ -386,7 +387,7 @@ namespace vcg {
case FaceType::NORMZ: case FaceType::NORMZ:
scaleFactor= 1/fPlane.Direction()[2]; scaleFactor= 1/fPlane.Direction()[2];
fEdge[0]*=d; fEdge[1]*=d;fEdge[2]*=d; fEdge[0]*=scaleFactor; fEdge[1]*=scaleFactor; fEdge[2]*=scaleFactor;
b0 = fEdge[1][0]*(p[1] - f.cP(1)[1]) - fEdge[1][1]*(p[0] - f.cP(1)[0]); b0 = fEdge[1][0]*(p[1] - f.cP(1)[1]) - fEdge[1][1]*(p[0] - f.cP(1)[0]);
if(b0<=0) if(b0<=0)