From: bph Date: Mon, 8 Aug 2011 13:43:47 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: EndWorkDidier~4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cca138b959e6a557671f3545370fe03853d19d90;p=tools%2Fmedcoupling.git *** empty log message *** --- diff --git a/src/INTERP_KERNEL/SplitterTetra.hxx b/src/INTERP_KERNEL/SplitterTetra.hxx index a90753c41..893d8c3c2 100644 --- a/src/INTERP_KERNEL/SplitterTetra.hxx +++ b/src/INTERP_KERNEL/SplitterTetra.hxx @@ -226,9 +226,9 @@ namespace INTERP_KERNEL inline void calculateVolume(TransformedTriangle& tri, const TriangleFaceKey& key); inline void calculateSurface(TransformedTriangle& tri, const TriangleFaceKey& key); - static inline bool isFacesCoplanar(const double *const planeNormal, const double planeConstant, + static inline bool IsFacesCoplanar(const double *const planeNormal, const double planeConstant, const double *const *const coordsFace, const double precision); - static inline double calculateIntersectionSurfaceOfCoplanarTriangles(const double *const planeNormal, + static inline double CalculateIntersectionSurfaceOfCoplanarTriangles(const double *const planeNormal, const double planeConstant, const double *const p1, const double *const p2, const double *const p3, const double *const p4, const double *const p5, const double *const p6, diff --git a/src/INTERP_KERNEL/SplitterTetra.txx b/src/INTERP_KERNEL/SplitterTetra.txx index a91575229..8d3265a75 100644 --- a/src/INTERP_KERNEL/SplitterTetra.txx +++ b/src/INTERP_KERNEL/SplitterTetra.txx @@ -389,7 +389,7 @@ namespace INTERP_KERNEL * @param precision precision for double float data used for comparison */ template - double SplitterTetra::calculateIntersectionSurfaceOfCoplanarTriangles(const double *const planeNormal, + double SplitterTetra::CalculateIntersectionSurfaceOfCoplanarTriangles(const double *const planeNormal, const double planeConstant, const double *const p1, const double *const p2, const double *const p3, const double *const p4, const double *const p5, const double *const p6, @@ -550,7 +550,7 @@ namespace INTERP_KERNEL * @param precision precision for double float data used for comparison */ template - bool SplitterTetra::isFacesCoplanar(const double *const planeNormal, + bool SplitterTetra::IsFacesCoplanar(const double *const planeNormal, const double planeConstant, const double *const *const coordsFace, const double precision) @@ -695,12 +695,12 @@ namespace INTERP_KERNEL } } double planeConstant = dot(planeNormal, coordsTetraTriNode1); - if (isFacesCoplanar(planeNormal, planeConstant, polyCoords, precision)) + if (IsFacesCoplanar(planeNormal, planeConstant, polyCoords, precision)) { int nbrPolyTri = polyNodesNbr - 2; // split polygon into nbrPolyTri triangles for (int iTri = 0; iTri < nbrPolyTri; ++iTri) { - double volume = calculateIntersectionSurfaceOfCoplanarTriangles(planeNormal, + double volume = CalculateIntersectionSurfaceOfCoplanarTriangles(planeNormal, planeConstant, polyCoords[0], polyCoords[1 + iTri],