Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix regressions
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_QuadToTriaAdaptor.cxx
diff --git
a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
index 9259d2e1da78a081c93fa908e9e84da2e1154cd5..2e4ea50b8fb3effa05cc7ff8904de0bbbf3d0df4 100644
(file)
--- a/
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
+++ b/
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
@@
-485,9
+485,6
@@
static bool HasIntersection3(const gp_Pnt& P, const gp_Pnt& PC, gp_Pnt& Pint,
gp_XYZ vert1 = P2.XYZ();
gp_XYZ vert2 = P3.XYZ();
gp_XYZ vert1 = P2.XYZ();
gp_XYZ vert2 = P3.XYZ();
- /* calculate distance from vert0 to ray origin */
- gp_XYZ tvec = orig - vert0;
-
gp_XYZ edge1 = vert1 - vert0;
gp_XYZ edge2 = vert2 - vert0;
gp_XYZ edge1 = vert1 - vert0;
gp_XYZ edge2 = vert2 - vert0;
@@
-497,9
+494,13
@@
static bool HasIntersection3(const gp_Pnt& P, const gp_Pnt& PC, gp_Pnt& Pint,
/* if determinant is near zero, ray lies in plane of triangle */
double det = edge1 * pvec;
/* if determinant is near zero, ray lies in plane of triangle */
double det = edge1 * pvec;
- if (det > -EPSILON && det < EPSILON)
+ const double ANGL_EPSILON = 1e-12;
+ if ( det > -ANGL_EPSILON && det < ANGL_EPSILON )
return false;
return false;
+ /* calculate distance from vert0 to ray origin */
+ gp_XYZ tvec = orig - vert0;
+
/* calculate U parameter and test bounds */
double u = ( tvec * pvec ) / det;
//if (u < 0.0 || u > 1.0)
/* calculate U parameter and test bounds */
double u = ( tvec * pvec ) / det;
//if (u < 0.0 || u > 1.0)