From ef7692d413c474cb03204c31b08e9c983d4279c5 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 12 Oct 2021 10:03:11 +0200 Subject: [PATCH] OCCT: port flatmesh to version 7.6 --- src/Mod/MeshPart/App/MeshFlattening.cpp | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Mod/MeshPart/App/MeshFlattening.cpp b/src/Mod/MeshPart/App/MeshFlattening.cpp index 245ed98b12..d01f8496c1 100644 --- a/src/Mod/MeshPart/App/MeshFlattening.cpp +++ b/src/Mod/MeshPart/App/MeshFlattening.cpp @@ -141,37 +141,37 @@ FaceUnwrapper::FaceUnwrapper(const TopoDS_Face& face) if (triangulation.IsNull()) throw std::runtime_error("null triangulation in face construction"); + Standard_Integer numNodes = triangulation->NbNodes(); + Standard_Integer numTriangles = triangulation->NbTriangles(); + // compute uv coordinates if (triangulation->HasUVNodes()) { - const TColgp_Array1OfPnt2d &_uv_nodes = triangulation->UVNodes(); - this->uv_nodes.resize(triangulation->NbNodes(), 2); + this->uv_nodes.resize(numNodes, 2); i = 0; - for (Standard_Integer index = _uv_nodes.Lower(); index <= _uv_nodes.Upper(); ++index) + for (Standard_Integer index = 1; index <= numNodes; ++index) { - const gp_Pnt2d& _uv_node = _uv_nodes.Value(index); + const gp_Pnt2d& _uv_node = triangulation->UVNode(index); this->uv_nodes.row(i) << _uv_node.X(), _uv_node.Y(); i++; } } // - const TColgp_Array1OfPnt &_nodes = triangulation->Nodes(); - this->xyz_nodes.resize(triangulation->NbNodes(), 3); + this->xyz_nodes.resize(numNodes, 3); i = 0; - for (Standard_Integer index = _nodes.Lower(); index <= _nodes.Upper(); ++index) + for (Standard_Integer index = 1; index <= numNodes; ++index) { - gp_Pnt _node = _nodes.Value(index); + gp_Pnt _node = triangulation->Node(index); this->xyz_nodes.row(i) << _node.X(), _node.Y(), _node.Z(); i++; } - - const Poly_Array1OfTriangle &_tris = triangulation->Triangles(); - this->tris.resize(triangulation->NbTriangles(), 3); + + this->tris.resize(numTriangles, 3); i = 0; - for (Standard_Integer index = _tris.Lower(); index <= _tris.Upper(); ++index) + for (Standard_Integer index = 1; index <= numTriangles; ++index) { int n1, n2, n3; - Poly_Triangle _tri = _tris.Value(index); + const Poly_Triangle& _tri = triangulation->Triangle(index); _tri.Get(n1, n2, n3); this->tris.row(i) << n1-1, n2-1, n3-1; i++;