diff --git a/GeoLib/Triangle.cpp b/GeoLib/Triangle.cpp index 02d4be34bd6fa6fa651f17bc0b0344e58f668579..a6edac30a8517fe8138989cb4b99d532d7b6ed43 100644 --- a/GeoLib/Triangle.cpp +++ b/GeoLib/Triangle.cpp @@ -22,7 +22,7 @@ namespace GeoLib { Triangle::Triangle (std::vector<Point *> const &pnt_vec) : - _pnts(pnt_vec), _initialized (false), _longest_edge (0.0) + _pnts(pnt_vec), _initialized (false) { assert(!_pnts.empty()); _pnt_ids[0] = std::numeric_limits<std::size_t>::max(); @@ -32,18 +32,12 @@ Triangle::Triangle (std::vector<Point *> const &pnt_vec) : Triangle::Triangle (std::vector<Point *> const &pnt_vec, std::size_t pnt_a, std::size_t pnt_b, std::size_t pnt_c) : - _pnts(pnt_vec), _initialized (true), _longest_edge (0.0) + _pnts(pnt_vec), _initialized (true) { assert(!_pnts.empty()); _pnt_ids[0] = pnt_a; _pnt_ids[1] = pnt_b; _pnt_ids[2] = pnt_c; - _longest_edge = MathLib::sqrDist (*_pnts[_pnt_ids[0]], *_pnts[_pnt_ids[1]]); - double tmp (MathLib::sqrDist (*_pnts[_pnt_ids[1]], *_pnts[_pnt_ids[2]])); - if (tmp > _longest_edge) _longest_edge = tmp; - tmp = MathLib::sqrDist (*_pnts[_pnt_ids[0]], *_pnts[_pnt_ids[2]]); - if (tmp > _longest_edge) _longest_edge = tmp; - _longest_edge = sqrt (_longest_edge); } void Triangle::setTriangle (std::size_t pnt_a, std::size_t pnt_b, std::size_t pnt_c) @@ -52,13 +46,6 @@ void Triangle::setTriangle (std::size_t pnt_a, std::size_t pnt_b, std::size_t pn _pnt_ids[0] = pnt_a; _pnt_ids[1] = pnt_b; _pnt_ids[2] = pnt_c; - - _longest_edge = MathLib::sqrDist (*_pnts[_pnt_ids[0]], *_pnts[_pnt_ids[1]]); - double tmp (MathLib::sqrDist (*_pnts[_pnt_ids[1]], *_pnts[_pnt_ids[2]])); - if (tmp > _longest_edge) _longest_edge = tmp; - tmp = MathLib::sqrDist (*_pnts[_pnt_ids[0]], *_pnts[_pnt_ids[2]]); - if (tmp > _longest_edge) _longest_edge = tmp; - _longest_edge = sqrt (_longest_edge); } bool Triangle::containsPoint(MathLib::Point3d const& q, double eps) const diff --git a/GeoLib/Triangle.h b/GeoLib/Triangle.h index 0f88e4515a00a70fa1acbe92618cd965c58e47b6..49841436d0b1f06bcdc554a71c78fca7851d6a8c 100644 --- a/GeoLib/Triangle.h +++ b/GeoLib/Triangle.h @@ -85,7 +85,6 @@ protected: /** position of pointers to the geometric points */ std::size_t _pnt_ids[3]; bool _initialized; - double _longest_edge; }; void getPlaneCoefficients(Triangle const& tri, double c[3]);