OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0025364: BRepMesh is not able to triangulate the shape with fine deflection

Browse Source 
Don't create data structures for whole set of faces. Necessary structures are created directly in BRepMesh_FastDiscret.
Don't copy nodes data during scaling, single structure is used.

Remove lines used for debug

Fix sphere: resolve problem came from merging.

Keep code clean - remove unnecessary logic, expected to be used for complicated restoration process.

Test cases for issue CR25364
This commit is contained in:
oan
2014-11-05 17:57:41 +03:00
committed by bugmaster
parent e3573bb9ec
commit 2caff0b32f
23 changed files with 602 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/BRepMesh/BRepMesh_FaceAttribute.cxx
View File

@@ -34,8 +34,7 @@ BRepMesh_FaceAttribute::BRepMesh_FaceAttribute()
myVMax (0.),
myDeltaX (1.),
myDeltaY (1.),
myStatus (BRepMesh_NoError),
myAllocator (new NCollection_IncAllocator(64000))
myStatus (BRepMesh_NoError)
{
init();
}
@@ -58,8 +57,7 @@ BRepMesh_FaceAttribute::BRepMesh_FaceAttribute(
myStatus (BRepMesh_NoError),
myBoundaryVertices(theBoundaryVertices),
myBoundaryPoints (theBoundaryPoints),
myFace (theFace),
myAllocator (new NCollection_IncAllocator(64000))
myFace (theFace)
{
init();
}
@@ -70,8 +68,6 @@ BRepMesh_FaceAttribute::BRepMesh_FaceAttribute(
//=======================================================================
BRepMesh_FaceAttribute::~BRepMesh_FaceAttribute()
{
Clear();
myAllocator.Nullify();
}
//=======================================================================
@@ -82,74 +78,30 @@ void BRepMesh_FaceAttribute::init()
{
myVertexEdgeMap = new BRepMesh::IMapOfInteger;
myInternalEdges = new BRepMesh::DMapOfShapePairOfPolygon;
mySurfacePoints = new BRepMesh::DMapOfIntegerPnt;
myLocation2D = new BRepMesh::DMapOfIntegerListOfXY;
myClassifier = new BRepMesh_Classifier;
if (!myFace.IsNull())
{
BRepTools::Update(myFace);
myFace.Orientation(TopAbs_FORWARD);
if (myFace.IsNull())
return;
BRepAdaptor_Surface aSurfAdaptor(myFace, Standard_False);
mySurface = new BRepAdaptor_HSurface(aSurfAdaptor);
}
BRepTools::Update(myFace);
myFace.Orientation(TopAbs_FORWARD);
BRepTools::UVBounds(myFace, myUMin, myUMax, myVMin, myVMax);
ResetStructure();
BRepAdaptor_Surface aSurfAdaptor(myFace, Standard_False);
mySurface = new BRepAdaptor_HSurface(aSurfAdaptor);
}
//=======================================================================
//function : Clear
//purpose :
//=======================================================================
void BRepMesh_FaceAttribute::Clear(
const Standard_Boolean isClearSurfaceDataOnly)
void BRepMesh_FaceAttribute::Clear()
{
clearLocal(isClearSurfaceDataOnly);
mySurfaceVertices.Clear();
mySurfacePoints->Clear();
mySurface.Nullify();
myClassifier.Nullify();
}
//=======================================================================
//function : clearLocal
//purpose :
//=======================================================================
void BRepMesh_FaceAttribute::clearLocal(
const Standard_Boolean isClearSurfaceDataOnly)
{
myLocation2D.Clear();
myVertexEdgeMap->Clear();
if (!isClearSurfaceDataOnly)
{
myInternalEdges->Clear();
}
myStructure.Nullify();
myAllocator->Reset(isClearSurfaceDataOnly);
}
//=======================================================================
//function : ResetStructure
//purpose :
//=======================================================================
Handle(BRepMesh_DataStructureOfDelaun)& BRepMesh_FaceAttribute::ResetStructure()
{
clearLocal();
myStructure = new BRepMesh_DataStructureOfDelaun(myAllocator);
if (!myFace.IsNull())
BRepTools::UVBounds(myFace, myUMin, myUMax, myVMin, myVMax);
Standard_Real aTolU = ToleranceU();
Standard_Real aTolV = ToleranceV();
myStructure->Data().SetCellSize(14.0 * aTolU, 14.0 * aTolV);
myStructure->Data().SetTolerance(aTolU, aTolV);
return myStructure;
myLocation2D->Clear();
myInternalEdges->Clear();
myVertexEdgeMap->Clear();
}
//=======================================================================
@@ -174,8 +126,8 @@ Standard_Boolean BRepMesh_FaceAttribute::getVertexIndex(
{
if (!myBoundaryVertices.IsNull() && myBoundaryVertices->IsBound(theVertex))
theVertexIndex = myBoundaryVertices->Find(theVertex);
else if (mySurfaceVertices.IsBound(theVertex))
theVertexIndex = mySurfaceVertices.Find(theVertex);
else if (!mySurfaceVertices.IsNull() && mySurfaceVertices->IsBound(theVertex))
theVertexIndex = mySurfaceVertices->Find(theVertex);
else
return Standard_False;