mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0025039: Improvement of code structure of general and supporting tools implemented in BRepMesh
Removed CDL declarations; Data collections are replaced by NCollections; Small code refactoring. Remove definition of BRepMesh class. Code refactoring of BRepMesh_IncrementalMesh. Function BRepMesh_Write storing BRepMesh_DataStructureOfDelaun to BRep file is added for debug needs. Static method BRepMesh_GeomTool::IntLinLin has been added to eliminate code duplications in BRepMesh_Dealun and BRepMesh_CircleTool. BRepMesh_CircleTool simplified method to find circumcircle. Fix merging conflicts Remove redundant function Fix compilation warning on MacOS Revert changes occurred during rebase Resolved merging conflicts Use parallel flag with BRepMesh_FastDiscret Test cases for issue CR25039_2
This commit is contained in:
oan
apn
@@ -18,22 +18,19 @@
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
#include <Standard_Macro.hxx>
|
||||
|
||||
#include <gp_XY.hxx>
|
||||
#include <gp_XYZ.hxx>
|
||||
#include <BRepMesh_CircleTool.hxx>
|
||||
#include <BRepMesh_Triangle.hxx>
|
||||
#include <BRepMesh_Edge.hxx>
|
||||
#include <BRepMesh_MapOfInteger.hxx>
|
||||
#include <BRepMesh_MapOfIntegerInteger.hxx>
|
||||
#include <BRepMesh_Collections.hxx>
|
||||
#include <BRepMesh_DataStructureOfDelaun.hxx>
|
||||
#include <NCollection_Sequence.hxx>
|
||||
#include <BRepMesh_WireInterferenceChecker.hxx>
|
||||
#include <BRepMesh_GeomTool.hxx>
|
||||
|
||||
class Bnd_B2d;
|
||||
class Bnd_Box2d;
|
||||
class BRepMesh_Array1OfVertexOfDelaun;
|
||||
class BRepMesh_Vertex;
|
||||
class TColStd_Array1OfInteger;
|
||||
class TColStd_SequenceOfInteger;
|
||||
class TColStd_MapOfInteger;
|
||||
|
||||
//! Compute the Delaunay's triangulation with the algorithm of Watson.
|
||||
class BRepMesh_Delaun
|
||||
@@ -43,52 +40,52 @@ public:
|
||||
DEFINE_STANDARD_ALLOC
|
||||
|
||||
//! Creates the triangulation with an empty Mesh data structure.
|
||||
Standard_EXPORT BRepMesh_Delaun (BRepMesh_Array1OfVertexOfDelaun& theVertices,
|
||||
const Standard_Boolean isPositive = Standard_True);
|
||||
Standard_EXPORT BRepMesh_Delaun (BRepMeshCol::Array1OfVertexOfDelaun& theVertices,
|
||||
const Standard_Boolean isPositive = Standard_True);
|
||||
|
||||
//! Creates the triangulation with an existent Mesh data structure.
|
||||
Standard_EXPORT BRepMesh_Delaun (const Handle(BRepMesh_DataStructureOfDelaun)& theOldMesh,
|
||||
BRepMesh_Array1OfVertexOfDelaun& theVertices,
|
||||
BRepMeshCol::Array1OfVertexOfDelaun& theVertices,
|
||||
const Standard_Boolean isPositive = Standard_True);
|
||||
|
||||
//! Creates the triangulation with an existant Mesh data structure.
|
||||
Standard_EXPORT BRepMesh_Delaun (const Handle(BRepMesh_DataStructureOfDelaun)& theOldMesh,
|
||||
TColStd_Array1OfInteger& theVertexIndices,
|
||||
BRepMeshCol::Array1OfInteger& theVertexIndices,
|
||||
const Standard_Boolean isPositive = Standard_True);
|
||||
|
||||
//! Initializes the triangulation with an array of vertices.
|
||||
Standard_EXPORT void Init (BRepMesh_Array1OfVertexOfDelaun& theVertices);
|
||||
Standard_EXPORT void Init (BRepMeshCol::Array1OfVertexOfDelaun& theVertices);
|
||||
|
||||
//! Removes a vertex from the triangulation.
|
||||
Standard_EXPORT void RemoveVertex (const BRepMesh_Vertex& theVertex);
|
||||
|
||||
//! Adds some vertices into the triangulation.
|
||||
Standard_EXPORT void AddVertices (BRepMesh_Array1OfVertexOfDelaun& theVertices);
|
||||
Standard_EXPORT void AddVertices (BRepMeshCol::Array1OfVertexOfDelaun& theVertices);
|
||||
|
||||
//! Modify mesh to use the edge.
|
||||
//! @return True if done
|
||||
Standard_EXPORT Standard_Boolean UseEdge (const Standard_Integer theEdge);
|
||||
|
||||
//! Gives the Mesh data structure.
|
||||
const Handle(BRepMesh_DataStructureOfDelaun)& Result() const
|
||||
inline const Handle(BRepMesh_DataStructureOfDelaun)& Result() const
|
||||
{
|
||||
return myMeshData;
|
||||
}
|
||||
|
||||
//! Gives the list of frontier edges.
|
||||
inline Handle(BRepMesh_MapOfInteger) Frontier() const
|
||||
inline BRepMeshCol::HMapOfInteger Frontier() const
|
||||
{
|
||||
return getEdgesByType (BRepMesh_Frontier);
|
||||
}
|
||||
|
||||
//! Gives the list of internal edges.
|
||||
inline Handle(BRepMesh_MapOfInteger) InternalEdges() const
|
||||
inline BRepMeshCol::HMapOfInteger InternalEdges() const
|
||||
{
|
||||
return getEdgesByType (BRepMesh_Fixed);
|
||||
}
|
||||
|
||||
//! Gives the list of free edges used only one time
|
||||
inline Handle(BRepMesh_MapOfInteger) FreeEdges() const
|
||||
inline BRepMeshCol::HMapOfInteger FreeEdges() const
|
||||
{
|
||||
return getEdgesByType (BRepMesh_Free);
|
||||
}
|
||||
@@ -127,31 +124,29 @@ private:
|
||||
InsertBefore
|
||||
};
|
||||
|
||||
typedef NCollection_DataMap<Standard_Integer, NCollection_Map<Standard_Integer> > DataMapOfMap;
|
||||
|
||||
typedef NCollection_Handle<NCollection_Map<Standard_Integer> > HandleOfMapOfInteger;
|
||||
typedef NCollection_DataMap<Standard_Integer, BRepMeshCol::MapOfInteger> DataMapOfMap;
|
||||
|
||||
//! Add boundig box for edge defined by start & end point to
|
||||
//! the given vector of bounding boxes for triangulation edges.
|
||||
void fillBndBox (NCollection_Sequence<Bnd_B2d>& theBoxes,
|
||||
void fillBndBox (BRepMeshCol::SequenceOfBndB2d& theBoxes,
|
||||
const BRepMesh_Vertex& theV1,
|
||||
const BRepMesh_Vertex& theV2);
|
||||
|
||||
//! Gives the list of edges with type defined by the input parameter.
|
||||
//! If the given type is BRepMesh_Free returns list of edges
|
||||
//! that have number of connected elements less or equal 1.
|
||||
Handle(BRepMesh_MapOfInteger) getEdgesByType (const BRepMesh_DegreeOfFreedom theEdgeType) const;
|
||||
BRepMeshCol::HMapOfInteger getEdgesByType (const BRepMesh_DegreeOfFreedom theEdgeType) const;
|
||||
|
||||
//! Create super mesh and run triangulation procedure.
|
||||
void perform (Bnd_Box2d& theBndBox,
|
||||
TColStd_Array1OfInteger& theVertexIndices);
|
||||
void perform (Bnd_Box2d& theBndBox,
|
||||
BRepMeshCol::Array1OfInteger& theVertexIndices);
|
||||
|
||||
//! Build the super mesh.
|
||||
void superMesh (const Bnd_Box2d& theBox);
|
||||
|
||||
//! Computes the triangulation and adds the vertices,
|
||||
//! edges and triangles to the Mesh data structure.
|
||||
void compute (TColStd_Array1OfInteger& theVertexIndices);
|
||||
void compute (BRepMeshCol::Array1OfInteger& theVertexIndices);
|
||||
|
||||
//! Adjust the mesh on the frontier.
|
||||
void frontierAdjust();
|
||||
@@ -159,56 +154,56 @@ private:
|
||||
//! Find left polygon of the given edge and call meshPolygon.
|
||||
Standard_Boolean meshLeftPolygonOf (const Standard_Integer theEdgeIndex,
|
||||
const Standard_Boolean isForward,
|
||||
HandleOfMapOfInteger theSkipped = NULL);
|
||||
BRepMeshCol::HMapOfInteger theSkipped = NULL);
|
||||
|
||||
//! Find next link starting from the given node and has maximum
|
||||
//! angle respect the given reference link.
|
||||
//! Each time the next link is found other neighbor links at the pivot
|
||||
//! node are marked as leprous and will be excluded from consideration
|
||||
//! next time until a hanging end is occured.
|
||||
Standard_Integer findNextPolygonLink (const Standard_Integer& theFirstNode,
|
||||
const Standard_Integer& thePivotNode,
|
||||
const BRepMesh_Vertex& thePivotVertex,
|
||||
const gp_Vec2d& theRefLinkDir,
|
||||
const NCollection_Sequence<Bnd_B2d>& theBoxes,
|
||||
const TColStd_SequenceOfInteger& thePolygon,
|
||||
const HandleOfMapOfInteger theSkipped,
|
||||
const Standard_Boolean& isSkipLeprous,
|
||||
NCollection_Map<Standard_Integer>& theLeprousLinks,
|
||||
NCollection_Map<Standard_Integer>& theDeadLinks,
|
||||
Standard_Integer& theNextPivotNode,
|
||||
gp_Vec2d& theNextLinkDir,
|
||||
Bnd_B2d& theNextLinkBndBox);
|
||||
Standard_Integer findNextPolygonLink (const Standard_Integer& theFirstNode,
|
||||
const Standard_Integer& thePivotNode,
|
||||
const BRepMesh_Vertex& thePivotVertex,
|
||||
const gp_Vec2d& theRefLinkDir,
|
||||
const BRepMeshCol::SequenceOfBndB2d& theBoxes,
|
||||
const BRepMeshCol::SequenceOfInteger& thePolygon,
|
||||
const BRepMeshCol::HMapOfInteger theSkipped,
|
||||
const Standard_Boolean& isSkipLeprous,
|
||||
BRepMeshCol::MapOfInteger& theLeprousLinks,
|
||||
BRepMeshCol::MapOfInteger& theDeadLinks,
|
||||
Standard_Integer& theNextPivotNode,
|
||||
gp_Vec2d& theNextLinkDir,
|
||||
Bnd_B2d& theNextLinkBndBox);
|
||||
|
||||
//! Check is the given link intersects the polygon boundaries.
|
||||
//! Returns bounding box for the given link trough the theLinkBndBox parameter.
|
||||
Standard_Boolean checkIntersection (const BRepMesh_Edge& theLink,
|
||||
const TColStd_SequenceOfInteger& thePolygon,
|
||||
const NCollection_Sequence<Bnd_B2d>& thePolyBoxes,
|
||||
const Standard_Boolean isConsiderEndPointTouch,
|
||||
const Standard_Boolean isConsiderPointOnEdge,
|
||||
const Standard_Boolean isSkipLastEdge,
|
||||
Bnd_B2d& theLinkBndBox) const;
|
||||
Standard_Boolean checkIntersection (const BRepMesh_Edge& theLink,
|
||||
const BRepMeshCol::SequenceOfInteger& thePolygon,
|
||||
const BRepMeshCol::SequenceOfBndB2d& thePolyBoxes,
|
||||
const Standard_Boolean isConsiderEndPointTouch,
|
||||
const Standard_Boolean isConsiderPointOnEdge,
|
||||
const Standard_Boolean isSkipLastEdge,
|
||||
Bnd_B2d& theLinkBndBox) const;
|
||||
|
||||
//! Triangulatiion of a closed polygon described by the list
|
||||
//! of indexes of its edges in the structure.
|
||||
//! (negative index means reversed edge)
|
||||
void meshPolygon (TColStd_SequenceOfInteger& thePolygon,
|
||||
NCollection_Sequence<Bnd_B2d>& thePolyBoxes,
|
||||
HandleOfMapOfInteger theSkipped = NULL);
|
||||
void meshPolygon (BRepMeshCol::SequenceOfInteger& thePolygon,
|
||||
BRepMeshCol::SequenceOfBndB2d& thePolyBoxes,
|
||||
BRepMeshCol::HMapOfInteger theSkipped = NULL);
|
||||
|
||||
//! Triangulatiion of a closed simple polygon (polygon without glued edges and loops)
|
||||
//! described by the list of indexes of its edges in the structure.
|
||||
//! (negative index means reversed edge)
|
||||
void meshSimplePolygon (TColStd_SequenceOfInteger& thePolygon,
|
||||
NCollection_Sequence<Bnd_B2d>& thePolyBoxes);
|
||||
void meshSimplePolygon (BRepMeshCol::SequenceOfInteger& thePolygon,
|
||||
BRepMeshCol::SequenceOfBndB2d& thePolyBoxes);
|
||||
|
||||
//! Triangulation of closed polygon containing only three edges.
|
||||
inline Standard_Boolean meshElementaryPolygon (const TColStd_SequenceOfInteger& thePolygon);
|
||||
inline Standard_Boolean meshElementaryPolygon (const BRepMeshCol::SequenceOfInteger& thePolygon);
|
||||
|
||||
//! Creates the triangles beetween the given node and the given polyline.
|
||||
void createTriangles (const Standard_Integer theVertexIndex,
|
||||
BRepMesh_MapOfIntegerInteger& thePoly);
|
||||
void createTriangles (const Standard_Integer theVertexIndex,
|
||||
BRepMeshCol::MapOfIntegerInteger& thePoly);
|
||||
|
||||
//! Add a triangle based on the given oriented edges into mesh
|
||||
inline void addTriangle (const Standard_Integer (&theEdgesId)[3],
|
||||
@@ -217,8 +212,8 @@ private:
|
||||
|
||||
//! Deletes the triangle with the given index and adds the free edges into the map.
|
||||
//! When an edge is suppressed more than one time it is destroyed.
|
||||
void deleteTriangle (const Standard_Integer theIndex,
|
||||
BRepMesh_MapOfIntegerInteger& theLoopEdges);
|
||||
void deleteTriangle (const Standard_Integer theIndex,
|
||||
BRepMeshCol::MapOfIntegerInteger& theLoopEdges);
|
||||
|
||||
//! Returns start and end nodes of the given edge in respect to its orientation.
|
||||
void getOrientedNodes (const BRepMesh_Edge& theEdge,
|
||||
@@ -227,21 +222,21 @@ private:
|
||||
|
||||
//! Processes loop within the given polygon formed by range of its
|
||||
//! links specified by start and end link indices.
|
||||
void processLoop (const Standard_Integer theLinkFrom,
|
||||
const Standard_Integer theLinkTo,
|
||||
const TColStd_SequenceOfInteger& thePolygon,
|
||||
const NCollection_Sequence<Bnd_B2d>& thePolyBoxes);
|
||||
void processLoop (const Standard_Integer theLinkFrom,
|
||||
const Standard_Integer theLinkTo,
|
||||
const BRepMeshCol::SequenceOfInteger& thePolygon,
|
||||
const BRepMeshCol::SequenceOfBndB2d& thePolyBoxes);
|
||||
|
||||
//! Creates new link based on the given nodes and updates the given polygon.
|
||||
Standard_Integer createAndReplacePolygonLink (const Standard_Integer theNodes[],
|
||||
const gp_Pnt2d thePnts [],
|
||||
const Standard_Integer theRootIndex,
|
||||
const ReplaceFlag theReplaceFlag,
|
||||
TColStd_SequenceOfInteger& thePolygon,
|
||||
NCollection_Sequence<Bnd_B2d>& thePolyBoxes);
|
||||
Standard_Integer createAndReplacePolygonLink (const Standard_Integer theNodes[],
|
||||
const gp_Pnt2d thePnts [],
|
||||
const Standard_Integer theRootIndex,
|
||||
const ReplaceFlag theReplaceFlag,
|
||||
BRepMeshCol::SequenceOfInteger& thePolygon,
|
||||
BRepMeshCol::SequenceOfBndB2d& thePolyBoxes);
|
||||
|
||||
//! Creates the triangles on new nodes.
|
||||
void createTrianglesOnNewVertices (TColStd_Array1OfInteger& theVertexIndices);
|
||||
void createTrianglesOnNewVertices (BRepMeshCol::Array1OfInteger& theVertexIndices);
|
||||
|
||||
//! Cleanup mesh from the free triangles.
|
||||
void cleanupMesh();
|
||||
@@ -257,35 +252,35 @@ private:
|
||||
const Standard_Integer thePrevElementId);
|
||||
|
||||
//! Remove internal triangles from the given polygon.
|
||||
void cleanupPolygon (const TColStd_SequenceOfInteger& thePolygon,
|
||||
const NCollection_Sequence<Bnd_B2d>& thePolyBoxes);
|
||||
void cleanupPolygon (const BRepMeshCol::SequenceOfInteger& thePolygon,
|
||||
const BRepMeshCol::SequenceOfBndB2d& thePolyBoxes);
|
||||
|
||||
//! Checks is the given vertex lies inside the polygon.
|
||||
Standard_Boolean isVertexInsidePolygon (const Standard_Integer& theVertexId,
|
||||
const NCollection_Vector<Standard_Integer>& thePolygonVertices) const;
|
||||
Standard_Boolean isVertexInsidePolygon (const Standard_Integer& theVertexId,
|
||||
const BRepMeshCol::VectorOfInteger& thePolygonVertices) const;
|
||||
|
||||
//! Remove all triangles and edges that are placed inside the polygon or crossed it.
|
||||
void killTrianglesAroundVertex (const Standard_Integer theZombieNodeId,
|
||||
const NCollection_Vector<Standard_Integer>& thePolyVertices,
|
||||
const NCollection_Map<Standard_Integer>& thePolyVerticesFindMap,
|
||||
const TColStd_SequenceOfInteger& thePolygon,
|
||||
const NCollection_Sequence<Bnd_B2d>& thePolyBoxes,
|
||||
NCollection_Map<Standard_Integer>& theSurvivedLinks,
|
||||
BRepMesh_MapOfIntegerInteger& theLoopEdges);
|
||||
void killTrianglesAroundVertex (const Standard_Integer theZombieNodeId,
|
||||
const BRepMeshCol::VectorOfInteger& thePolyVertices,
|
||||
const BRepMeshCol::MapOfInteger& thePolyVerticesFindMap,
|
||||
const BRepMeshCol::SequenceOfInteger& thePolygon,
|
||||
const BRepMeshCol::SequenceOfBndB2d& thePolyBoxes,
|
||||
BRepMeshCol::MapOfInteger& theSurvivedLinks,
|
||||
BRepMeshCol::MapOfIntegerInteger& theLoopEdges);
|
||||
|
||||
//! Checks is the given link crosses the polygon boundary.
|
||||
//! If yes, kills its triangles and checks neighbor links on boundary intersection. Does nothing elsewhere.
|
||||
void killTrianglesOnIntersectingLinks (const Standard_Integer& theLinkToCheckId,
|
||||
const BRepMesh_Edge& theLinkToCheck,
|
||||
const Standard_Integer& theEndPoint,
|
||||
const TColStd_SequenceOfInteger& thePolygon,
|
||||
const NCollection_Sequence<Bnd_B2d>& thePolyBoxes,
|
||||
NCollection_Map<Standard_Integer>& theSurvivedLinks,
|
||||
BRepMesh_MapOfIntegerInteger& theLoopEdges);
|
||||
void killTrianglesOnIntersectingLinks (const Standard_Integer& theLinkToCheckId,
|
||||
const BRepMesh_Edge& theLinkToCheck,
|
||||
const Standard_Integer& theEndPoint,
|
||||
const BRepMeshCol::SequenceOfInteger& thePolygon,
|
||||
const BRepMeshCol::SequenceOfBndB2d& thePolyBoxes,
|
||||
BRepMeshCol::MapOfInteger& theSurvivedLinks,
|
||||
BRepMeshCol::MapOfIntegerInteger& theLoopEdges);
|
||||
|
||||
//! Kill triangles bound to the given link.
|
||||
void killLinkTriangles (const Standard_Integer& theLinkId,
|
||||
BRepMesh_MapOfIntegerInteger& theLoopEdges);
|
||||
void killLinkTriangles (const Standard_Integer& theLinkId,
|
||||
BRepMeshCol::MapOfIntegerInteger& theLoopEdges);
|
||||
|
||||
//! Calculates distances between the given point and edges of triangle.
|
||||
Standard_Real calculateDist (const gp_XY theVEdges[3],
|
||||
@@ -297,7 +292,7 @@ private:
|
||||
Standard_Integer& theEdgeOn) const;
|
||||
|
||||
//! Checks intersection between the two segments.
|
||||
BRepMesh_WireInterferenceChecker::IntFlag intSegSeg (
|
||||
BRepMesh_GeomTool::IntFlag intSegSeg(
|
||||
const BRepMesh_Edge& theEdge1,
|
||||
const BRepMesh_Edge& theEdge2,
|
||||
const Standard_Boolean isConsiderEndPointTouch,
|
||||
@@ -305,9 +300,9 @@ private:
|
||||
gp_Pnt2d& theIntPnt) const;
|
||||
|
||||
//! Returns area of the loop of the given polygon defined by indices of its start and end links.
|
||||
Standard_Real polyArea (const TColStd_SequenceOfInteger& thePolygon,
|
||||
const Standard_Integer theStartIndex,
|
||||
const Standard_Integer theEndIndex) const;
|
||||
Standard_Real polyArea (const BRepMeshCol::SequenceOfInteger& thePolygon,
|
||||
const Standard_Integer theStartIndex,
|
||||
const Standard_Integer theEndIndex) const;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user