Commit 14bc06ef authored by Mathieu Malaterre's avatar Mathieu Malaterre
Browse files

BUG: Fix Bug #722 - vtkTriangle::IntersectWithLine

parent 05469f51
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "vtkPolygon.h" #include "vtkPolygon.h"
#include "vtkQuadric.h" #include "vtkQuadric.h"
vtkCxxRevisionMacro(vtkTriangle, "1.104"); vtkCxxRevisionMacro(vtkTriangle, "1.105");
vtkStandardNewMacro(vtkTriangle); vtkStandardNewMacro(vtkTriangle);
// Construct the triangle with three points. // Construct the triangle with three points.
...@@ -500,14 +500,16 @@ int vtkTriangle::IntersectWithLine(double p1[3], double p2[3], double tol, ...@@ -500,14 +500,16 @@ int vtkTriangle::IntersectWithLine(double p1[3], double p2[3], double tol,
// Evaluate position // Evaluate position
// //
if (this->EvaluatePosition(x, closestPoint, subId, pcoords, dist2, weights) int inside;
>= 0) if ( (inside = this->EvaluatePosition(x, closestPoint, subId, pcoords,
dist2, weights)) >= 0)
{ {
if ( dist2 <= tol2 ) if ( dist2 <= tol2 )
{ {
pcoords[2] = 0.0; pcoords[2] = 0.0;
return 1; return 1;
} }
return inside;
} }
// so the easy test failed. The line is not intersecting the triangle. // so the easy test failed. The line is not intersecting the triangle.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment