ccolin/pfe
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: ccolin:ae368cdfb4272820003ef0fbf8b9c8fbbec301db
Branches Tags
ccolin:master
..
compare: ccolin:aa3e6e67df0e250562833bf567c12864a9c51318
Branches Tags
ccolin:master

2 Commits
ae368cdfb4 ... aa3e6e67df

Author SHA1 Message Date
CookieKastanie
aa3e6e67df Merge branch 'master' of https://git.lamaisondescouillons.fr/ccolin/pfe 2022-03-04 11:05:52 +01:00
CookieKastanie
7e9d928af1 distance is now signed 2022-03-04 11:05:37 +01:00
1 changed files with 14 additions and 2 deletions
Show Stats Expand all files Collapse all files

16
src/point_tris_dist.cc
View File

@ -52,6 +52,8 @@ double pointTriangleDistance(double *p, vtkCell *triangle, double *direction) {
double db = vtkMath::Dot(vecTB, bp); double db = vtkMath::Dot(vecTB, bp);
double dc = vtkMath::Dot(vecTC, cp); double dc = vtkMath::Dot(vecTC, cp);
double distance = 0;
if(da <= 0 && db <= 0 && dc <= 0) { if(da <= 0 && db <= 0 && dc <= 0) {
double na[3] = { double na[3] = {
n[0] * a[0], n[0] * a[0],
@ -78,7 +80,7 @@ double pointTriangleDistance(double *p, vtkCell *triangle, double *direction) {
direction[1] = nt[1]; direction[1] = nt[1];
direction[2] = nt[2]; direction[2] = nt[2];
vtkMath::Normalize(direction); vtkMath::Normalize(direction);
return vtkMath::Norm(nt); distance = vtkMath::Norm(nt);
} else { } else {
double normalA[3]; double normalA[3];
@ -105,6 +107,16 @@ double pointTriangleDistance(double *p, vtkCell *triangle, double *direction) {
direction[2] = normalC[2]; direction[2] = normalC[2];
} }
return min; distance = min;
} }
if(vtkMath::Dot(direction, n) < 0) {
direction[0] = -direction[0];
direction[1] = -direction[1];
direction[2] = -direction[2];
return -distance;
} else {
return distance;
}
} }