ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '2090e7d4fa6394a4eee1bbf9432dbd09d6e69648'

Browse Source
This commit is contained in:
BERNHARD Martin OpenCascade 2023-05-11 15:26:43 +02:00
commit 77dd934774
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -76,6 +76,7 @@
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <TopoDS_Compound.hxx> #include <TopoDS_Compound.hxx>
#include <Basics_OCCTVersion.hxx>
// Netgen include files // Netgen include files
#ifndef OCCGEOMETRY #ifndef OCCGEOMETRY
#define OCCGEOMETRY #define OCCGEOMETRY
@ -876,12 +877,21 @@ void NETGENPlugin_Mesher::SetLocalSizeForChordalError( netgen::OCCGeometry& occg
{ {
Standard_Integer n1,n2,n3; Standard_Integer n1,n2,n3;
triangulation->Triangles()(i).Get( n1,n2,n3 ); triangulation->Triangles()(i).Get( n1,n2,n3 );
#if OCC_VERSION_LARGE < 0x07060000
p [0] = triangulation->Nodes()(n1).Transformed(loc).XYZ(); p [0] = triangulation->Nodes()(n1).Transformed(loc).XYZ();
p [1] = triangulation->Nodes()(n2).Transformed(loc).XYZ(); p [1] = triangulation->Nodes()(n2).Transformed(loc).XYZ();
p [2] = triangulation->Nodes()(n3).Transformed(loc).XYZ(); p [2] = triangulation->Nodes()(n3).Transformed(loc).XYZ();
uv[0] = triangulation->UVNodes()(n1).XY(); uv[0] = triangulation->UVNodes()(n1).XY();
uv[1] = triangulation->UVNodes()(n2).XY(); uv[1] = triangulation->UVNodes()(n2).XY();
uv[2] = triangulation->UVNodes()(n3).XY(); uv[2] = triangulation->UVNodes()(n3).XY();
#else
p[0] = triangulation->Node(n1).Transformed(loc).XYZ();
p[1] = triangulation->Node(n2).Transformed(loc).XYZ();
p[2] = triangulation->Node(n3).Transformed(loc).XYZ();
uv[0] = triangulation->UVNode(n1).XY();
uv[1] = triangulation->UVNode(n2).XY();
uv[2] = triangulation->UVNode(n3).XY();
#endif
surfProp.SetParameters( uv[0].X(), uv[0].Y() ); surfProp.SetParameters( uv[0].X(), uv[0].Y() );
if ( !surfProp.IsCurvatureDefined() ) if ( !surfProp.IsCurvatureDefined() )
break; break;
@ -1039,7 +1049,14 @@ double NETGENPlugin_Mesher::GetDefaultMinSize(const TopoDS_Shape& geom,
BRep_Tool::Triangulation ( TopoDS::Face( fExp.Current() ), loc); BRep_Tool::Triangulation ( TopoDS::Face( fExp.Current() ), loc);
if ( triangulation.IsNull() ) continue; if ( triangulation.IsNull() ) continue;
const double fTol = BRep_Tool::Tolerance( TopoDS::Face( fExp.Current() )); const double fTol = BRep_Tool::Tolerance( TopoDS::Face( fExp.Current() ));
const TColgp_Array1OfPnt& points = triangulation->Nodes(); #if OCC_VERSION_HEX < 0x070600
const TColgp_Array1OfPnt& points = triangulation->Nodes();
#else
auto points = [&triangulation](Standard_Integer index) {
return triangulation->Node(index);
};
#endif
const Poly_Array1OfTriangle& trias = triangulation->Triangles(); const Poly_Array1OfTriangle& trias = triangulation->Triangles();
for ( int iT = trias.Lower(); iT <= trias.Upper(); ++iT ) for ( int iT = trias.Lower(); iT <= trias.Upper(); ++iT )
{ {