OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0023105: Exception during Meshing / Missing triangles

Browse Source 
Fix compilation error on Linux
Adding test command for this fix
meshPolygon: simplify source polygon by splitting it onto parts without glued edges and loops
Check surrounded triangles during final cleaning of mesh
Correct polygon on frontier edges
Modified test cases in group mesh according to new behavior
This commit is contained in:
oan 2013-07-25 13:11:00 +04:00
parent 55f1e74d75
commit 304c45c83f
24 changed files with 2289 additions and 1479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BRepMesh/BRepMesh.cdl
View File

@ -73,7 +73,7 @@ is enumeration DegreeOfFreedom is
class Edge;
class Triangle;
imported Triangle from BRepMesh;
class ShapeTool;
@ -84,6 +84,7 @@ is enumeration DegreeOfFreedom is
--
pointer PDiscretRoot to DiscretRoot from BRepMesh;
--
imported Delaun from BRepMesh;
imported MapOfIntegerInteger from BRepMesh;
imported MapOfInteger from BRepMesh;
imported ListOfInteger from BRepMesh;
@ -100,7 +101,6 @@ is enumeration DegreeOfFreedom is
class ComparatorOfVertexOfDelaun;
class ComparatorOfIndexedVertexOfDelaun;
class SelectorOfDataStructureOfDelaun;
class Delaun;
class DataStructureOfDelaun;
class CircleTool;
class VertexTool;

260
src/BRepMesh/BRepMesh_Delaun.cdl
View File

@ -1,260 +0,0 @@
-- Created on: 1993-05-11
-- Created by: Didier PIFFAULT
-- Copyright (c) 1993-1999 Matra Datavision
-- Copyright (c) 1999-2012 OPEN CASCADE SAS
--
-- The content of this file is subject to the Open CASCADE Technology Public
-- License Version 6.5 (the "License"). You may not use the content of this file
-- except in compliance with the License. Please obtain a copy of the License
-- at http://www.opencascade.org and read it completely before using this file.
--
-- The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-- main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
--
-- The Original Code and all software distributed under the License is
-- distributed on an "AS IS" basis, without warranty of any kind, and the
-- Initial Developer hereby disclaims all such warranties, including without
-- limitation, any warranties of merchantability, fitness for a particular
-- purpose or non-infringement. Please see the License for the specific terms
-- and conditions governing the rights and limitations under the License.
class Delaun from BRepMesh
---Purpose: Compute the Delaunay's triangulation with the
-- algorithm of Watson.
uses Integer from Standard,
SequenceOfInteger from TColStd,
MapOfInteger from TColStd,
Array1OfInteger from TColStd,
Box2d from Bnd,
CircleTool from BRepMesh,
MapOfInteger from BRepMesh,
DataStructureOfDelaun from BRepMesh,
MapOfIntegerInteger from BRepMesh,
Vertex from BRepMesh,
Edge from BRepMesh,
Triangle from BRepMesh,
ComparatorOfVertexOfDelaun from BRepMesh,
ComparatorOfIndexedVertexOfDelaun from BRepMesh,
Array1OfVertexOfDelaun from BRepMesh,
HArray1OfVertexOfDelaun from BRepMesh,
HeapSortVertexOfDelaun from BRepMesh,
HeapSortIndexedVertexOfDelaun from BRepMesh
is
-- Interface :
Create (Vertices : in out Array1OfVertexOfDelaun from BRepMesh;
ZPositive : in Boolean from Standard=Standard_True)
---Purpose: Creates the triangulation with an empty Mesh
-- data structure.
returns Delaun from BRepMesh;
Create (OldMesh : mutable DataStructureOfDelaun from BRepMesh;
Vertices : in out Array1OfVertexOfDelaun from BRepMesh;
ZPositive : in Boolean from Standard=Standard_True)
---Purpose: Creates the triangulation with and existant
-- Mesh data structure.
returns Delaun from BRepMesh;
Create (OldMesh : mutable DataStructureOfDelaun from BRepMesh;
VertexIndices : in out Array1OfInteger from TColStd;
ZPositive : in Boolean from Standard=Standard_True)
---Purpose: Creates the triangulation with and existant
-- Mesh data structure.
returns Delaun from BRepMesh;
RemoveVertex (me : in out;
theVertex : in Vertex from BRepMesh);
---Purpose: Removes a vertex in the triangulation.
AddVertices (me : in out;
Vertices : in out Array1OfVertexOfDelaun from BRepMesh);
---Purpose: Adds some vertices in the triangulation.
UseEdge (me : in out;
theEdge : in Integer from Standard)
---Purpose: Modify mesh to use the edge. Return True if done.
returns Boolean from Standard;
Result (me)
---C++: return const &
---Purpose: Gives the Mesh data structure.
returns DataStructureOfDelaun from BRepMesh;
Frontier (me : in out)
---Purpose: Gives the list of frontier edges
---C++: return const &
returns MapOfInteger from BRepMesh;
InternalEdges (me : in out)
---Purpose: Gives the list of internal edges
---C++: return const &
returns MapOfInteger from BRepMesh;
FreeEdges (me : in out)
---Purpose: Gives the list of free edges used only one time
---C++: return const &
returns MapOfInteger from BRepMesh;
GetVertex (me;
vIndex : in Integer from Standard)
---C++: return const &
---C++: inline
returns Vertex from BRepMesh;
GetEdge (me;
eIndex : in Integer from Standard)
---C++: return const &
---C++: inline
returns Edge from BRepMesh;
GetTriangle (me;
tIndex : in Integer from Standard)
---C++: return const &
---C++: inline
returns Triangle from BRepMesh;
-- Implementation :
Init (me : in out;
Vertices : in out Array1OfVertexOfDelaun from BRepMesh);
---Purpose: Initializes the triangulation with an Array of
-- Vertex.
Compute (me : in out;
VertexIndices : in out Array1OfInteger from TColStd);
---Purpose: Computes the triangulation and add the vertices
-- edges and triangles to the Mesh data structure.
SuperMesh (me : in out;
theBox : Box2d from Bnd);
---Purpose: Build the super mesh .
FrontierAdjust (me : in out)
---Purpose: Adjust the mesh on the frontier.
is private;
MeshLeftPolygonOf (me : in out;
EdgeIndex : Integer from Standard;
EdgeSens : Boolean from Standard)
---Purpose: Find left polygon of the edge and call MeshPolygon.
is private;
MeshPolygon (me : in out;
Polygon : in out SequenceOfInteger from TColStd)
---Purpose: Mesh closed polygon.
is private;
CreateTriangles(me : in out;
vertexIndex : Integer from Standard;
--vertex : in Vertex from BRepMesh;
freeEdges: out MapOfIntegerInteger from BRepMesh)
---Purpose: Creates the triangles beetween the node
-- <Vertex> and the polyline <freeEdges>.
is private;
DeleteTriangle (me : in out;
TrianIndex : Integer from Standard;
freeEdges : out MapOfIntegerInteger from BRepMesh)
---Purpose: Deletes the triangle of index <TrianIndex> and
-- add the free edges to the map.
-- When an edge is suppressed more than one time
-- it is destroyed.
is private;
Perform (me: in out;
theBndBox : out Box2d from Bnd;
theVertexIndices: out Array1OfInteger from TColStd)
is private;
Contains (me;
TrianIndex : Integer from Standard;
theVertex : in Vertex from BRepMesh;
edgeOn : out Integer from Standard)
---Purpose: Test if triangle of index <TrianIndex>
-- contains geometricaly <theVertex>. If <EdgeOn>
-- is != 0 then theVertex is on Edge of index
-- <edgeOn>.
returns Boolean from Standard;
CreateTrianglesOnNewVertices(me : in out;
theVertexIndices: out Array1OfInteger from TColStd)
--vertex : in Vertex from BRepMesh;
---Purpose: Creates the triangles on new nodes
is private;
IntSegSeg (me : in out;
theEdge1 : in Edge from BRepMesh;
theEdge2 : in Edge from BRepMesh)
---Purpose: Check intersection between the two segments.
returns Boolean is private;
KillInternalTriangles(me: in out;
theEdgeId : Integer from Standard;
theIgnoredEdges : in MapOfInteger from TColStd;
theLoopEdges : out MapOfIntegerInteger from BRepMesh)
---Purpose: Removes triangles within polygon
is private;
CleanupMesh(me: in out)
---Purpose: Cleanup mesh from the free triangles
is private;
RemovePivotTriangles(me: in out;
theEdgeInfo : Integer from Standard;
thePivotNode : Integer from Standard;
theInfectedEdges : out MapOfInteger from TColStd;
theLoopEdges : out MapOfIntegerInteger from BRepMesh;
isFirstPass : Boolean from Standard)
---Purpose: Removes triangles around the given pivot node
is private;
CleanupPolygon(me: in out;
thePolygon : in SequenceOfInteger from TColStd;
theInfectedEdges : out MapOfInteger from TColStd;
theLoopEdges : out MapOfIntegerInteger from BRepMesh)
---Purpose: Remove internal triangles from the given polygon
is private;
fields myMeshData : DataStructureOfDelaun from BRepMesh;
myPositiveOrientation : Boolean from Standard;
myCircles : CircleTool from BRepMesh;
mySupVert1 : Integer from Standard;
mySupVert2 : Integer from Standard;
mySupVert3 : Integer from Standard;
mySupTrian : Triangle from BRepMesh;
myMapEdges : MapOfInteger from BRepMesh;
end Delaun;

2455
src/BRepMesh/BRepMesh_Delaun.cxx
View File

File diff suppressed because it is too large Load Diff

353
src/BRepMesh/BRepMesh_Delaun.hxx Normal file
View File

@ -0,0 +1,353 @@
// Copyright (c) 2013 OPEN CASCADE SAS
//
// The content of this file is subject to the Open CASCADE Technology Public
// License Version 6.5 (the "License"). You may not use the content of this file
// except in compliance with the License. Please obtain a copy of the License
// at http://www.opencascade.org and read it completely before using this file.
//
// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
//
// The Original Code and all software distributed under the License is
// distributed on an "AS IS" basis, without warranty of any kind, and the
// Initial Developer hereby disclaims all such warranties, including without
// limitation, any warranties of merchantability, fitness for a particular
// purpose or non-infringement. Please see the License for the specific terms
// and conditions governing the rights and limitations under the License.
#ifndef _BRepMesh_Delaun_HeaderFile
#define _BRepMesh_Delaun_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Macro.hxx>
#include <BRepMesh_CircleTool.hxx>
#include <BRepMesh_Triangle.hxx>
#include <BRepMesh_Edge.hxx>
#include <BRepMesh_MapOfInteger.hxx>
#include <BRepMesh_MapOfIntegerInteger.hxx>
#include <BRepMesh_DataStructureOfDelaun.hxx>
#include <NCollection_Sequence.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 <br>
//! algorithm of Watson. <br>
class BRepMesh_Delaun {
public:
DEFINE_STANDARD_ALLOC
//! Creates the triangulation with an empty Mesh <br>
//! data structure. <br>
Standard_EXPORT BRepMesh_Delaun( BRepMesh_Array1OfVertexOfDelaun& theVertices,
const Standard_Boolean isPositive = Standard_True );
//! Creates the triangulation with and existent <br>
//! Mesh data structure. <br>
Standard_EXPORT BRepMesh_Delaun( const Handle(BRepMesh_DataStructureOfDelaun)& theOldMesh,
BRepMesh_Array1OfVertexOfDelaun& theVertices,
const Standard_Boolean isPositive = Standard_True );
//! Creates the triangulation with and existant <br>
//! Mesh data structure. <br>
Standard_EXPORT BRepMesh_Delaun( const Handle(BRepMesh_DataStructureOfDelaun)& theOldMesh,
TColStd_Array1OfInteger& theVertexIndices,
const Standard_Boolean isPositive = Standard_True );
//! Initializes the triangulation with an array of <br>
//! vertices. <br>
Standard_EXPORT void Init( BRepMesh_Array1OfVertexOfDelaun& theVertices );
//! Removes a vertex from the triangulation. <br>
Standard_EXPORT void RemoveVertex( const BRepMesh_Vertex& theVertex );
//! Adds some vertices into the triangulation. <br>
Standard_EXPORT void AddVertices( BRepMesh_Array1OfVertexOfDelaun& theVertices );
//! Modify mesh to use the edge. Return True if done. <br>
Standard_EXPORT Standard_Boolean UseEdge( const Standard_Integer theEdge );
//! Gives the Mesh data structure. <br>
Standard_EXPORT const Handle(BRepMesh_DataStructureOfDelaun)& Result() const
{
return myMeshData;
}
//! Gives the list of frontier edges <br>
inline Handle(BRepMesh_MapOfInteger) Frontier() const
{
return getEdgesByType( BRepMesh_Frontier );
}
//! Gives the list of internal edges <br>
inline Handle(BRepMesh_MapOfInteger) InternalEdges() const
{
return getEdgesByType( BRepMesh_Fixed );
}
//! Gives the list of free edges used only one time <br>
inline Handle(BRepMesh_MapOfInteger) FreeEdges() const
{
return getEdgesByType( BRepMesh_Free );
}
//! Gives vertex with the given index <br>
inline const BRepMesh_Vertex& GetVertex( const Standard_Integer theIndex ) const
{
return myMeshData->GetNode( theIndex );
}
//! Gives edge with the given index <br>
inline const BRepMesh_Edge& GetEdge( const Standard_Integer theIndex ) const
{
return myMeshData->GetLink( theIndex );
}
//! Gives triangle with the given index <br>
inline const BRepMesh_Triangle& GetTriangle( const Standard_Integer theIndex ) const
{
return myMeshData->GetElement( theIndex );
}
//! Test is the given triangle contains the given vertex. <br>
//! If <theEdgeOn> != 0 the vertex lies onto the edge index <br>
//! returned through this parameter. <br>
Standard_EXPORT Standard_Boolean Contains( const Standard_Integer theTriangleId,
const BRepMesh_Vertex& theVertex,
Standard_Integer& theEdgeOn ) const;
private:
enum IntFlag
{
NoIntersection,
Cross,
EndPointTouch,
PointOnEdge,
Glued,
Same
};
enum ReplaceFlag
{
Replace,
InsertAfter,
InsertBefore
};
typedef NCollection_DataMap<Standard_Integer, NCollection_Map<Standard_Integer> > DataMapOfMap;
typedef NCollection_Handle<NCollection_Map<Standard_Integer> > HandleOfMapOfInteger;
//! Add boundig box for edge defined by start & end point to <br>
//! the given vector of bounding boxes for triangulation edges <br>
void fillBndBox( NCollection_Sequence<Bnd_B2d>& theBoxes,
const BRepMesh_Vertex& theV1,
const BRepMesh_Vertex& theV2 );
//! Gives the list of edges with type defined by the input parameter. <br>
//! If the given type is BRepMesh_Free returns list of edges <br>
//! that have number of connected elements less or equal 1 <br>
Handle(BRepMesh_MapOfInteger) getEdgesByType( const BRepMesh_DegreeOfFreedom theEdgeType ) const;
//! Create super mesh and run triangulation procedure <br>
void perform( Bnd_Box2d& theBndBox,
TColStd_Array1OfInteger& theVertexIndices );
//! Build the super mesh. <br>
void superMesh( const Bnd_Box2d& theBox );
//! Computes the triangulation and adds the vertices, <br>
//! edges and triangles to the Mesh data structure. <br>
void compute( TColStd_Array1OfInteger& theVertexIndices );
//! Adjust the mesh on the frontier. <br>
void frontierAdjust();
//! Find left polygon of the given edge and call meshPolygon. <br>
Standard_Boolean meshLeftPolygonOf( const Standard_Integer theEdgeIndex,
const Standard_Boolean isForward,
HandleOfMapOfInteger theSkipped = NULL );
//! Find next link starting from the given node and has maximum <br>
//! angle respect the given reference link. <br>
//! Each time the next link is found other neighbor links at the pivot <br>
//! node are marked as leprous and will be excluded from consideration <br>
//! next time until a hanging end is occured. <br>
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 );
//! Check is the given link intersects the polygon boundaries. <br>
//! Returns bounding box for the given link trough the <theLinkBndBox> parameter. <br>
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;
//! Triangulatiion of a closed polygon described by the list <br>
//! of indexes of its edges in the structure. <br>
//! (negative index means reversed edge) <br>
void meshPolygon( TColStd_SequenceOfInteger& thePolygon,
NCollection_Sequence<Bnd_B2d>& thePolyBoxes,
HandleOfMapOfInteger theSkipped = NULL );
//! Triangulatiion of a closed simple polygon (polygon without glued edges and loops) <br>
//! described by the list of indexes of its edges in the structure. <br>
//! (negative index means reversed edge) <br>
void meshSimplePolygon( TColStd_SequenceOfInteger& thePolygon,
NCollection_Sequence<Bnd_B2d>& thePolyBoxes );
//! Triangulation of closed polygon containing only three edges.
inline Standard_Boolean meshElementaryPolygon( const TColStd_SequenceOfInteger& thePolygon );
//! Creates the triangles beetween the given node <br>
//! and the given polyline. <br>
void createTriangles( const Standard_Integer theVertexIndex,
BRepMesh_MapOfIntegerInteger& thePoly );
//! Add a triangle based on the given oriented edges into mesh <br>
inline void addTriangle( const Standard_Integer (&theEdgesId)[3],
const Standard_Boolean (&theEdgesOri)[3],
const Standard_Integer (&theNodesId)[3] );
//! Deletes the triangle with the given index and <br>
//! adds the free edges into the map. <br>
//! When an edge is suppressed more than one time <br>
//! it is destroyed. <br>
void deleteTriangle( const Standard_Integer theIndex,
BRepMesh_MapOfIntegerInteger& theLoopEdges );
//! Returns start and end nodes of the given edge <br>
//! in respect to its orientation. <br>
void getOrientedNodes(const BRepMesh_Edge& theEdge,
const Standard_Boolean isForward,
Standard_Integer *theNodes) const;
//! Processes loop within the given polygon formed by range of its <br>
//! links specified by start and end link indices. <br>
void processLoop(const Standard_Integer theLinkFrom,
const Standard_Integer theLinkTo,
const TColStd_SequenceOfInteger& thePolygon,
const NCollection_Sequence<Bnd_B2d>& 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);
//! Creates the triangles on new nodes <br>
void createTrianglesOnNewVertices( TColStd_Array1OfInteger& theVertexIndices );
//! Cleanup mesh from the free triangles <br>
void cleanupMesh();
//! Goes through the neighbour triangles around the given node started
//! from the given link, returns TRUE if some triangle has a bounding
//! frontier edge or FALSE elsewhere.
//! Stop link is used to prevent cycles.
//! Previous element Id is used to identify next neighbor element.
Standard_Boolean isBoundToFrontier(const Standard_Integer theRefNodeId,
const Standard_Integer theRefLinkId,
const Standard_Integer theStopLinkId,
const Standard_Integer thePrevElementId);
//! Remove internal triangles from the given polygon <br>
void cleanupPolygon( const TColStd_SequenceOfInteger& thePolygon,
const NCollection_Sequence<Bnd_B2d>& thePolyBoxes );
//! Checks is the given vertex lies inside the polygon <br>
Standard_Boolean isVertexInsidePolygon( const Standard_Integer& theVertexId,
const NCollection_Vector<Standard_Integer>& thePolygonVertices ) const;
//! Remove all triangles and edges that are placed <br>
//! inside the polygon or crossed it. <br>
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 );
//! Checks is the given link crosses the polygon boundary. <br>
//! If yes, kills its triangles and checks neighbor links on <br>
//! boundary intersection. Does nothing elsewhere. <br>
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 );
//! Kill triangles bound to the given link. <br>
void killLinkTriangles( const Standard_Integer& theLinkId,
BRepMesh_MapOfIntegerInteger& theLoopEdges );
//! Calculates distances between the given point <br>
//! and edges of triangle. <br>
Standard_Real calculateDist( const gp_XY theVEdges[3],
const gp_XY thePoints[3],
const Standard_Integer theEdgesId[3],
const BRepMesh_Vertex& theVertex,
Standard_Real theDistance[3],
Standard_Real theSqModulus[3],
Standard_Integer& theEdgeOn ) const;
//! Classifies the point in case of coincidence of two vectors. <br>
//! Returns zero value if point is out of segment and non zero <br>
//! value if point is between the first and the second point of segment. <br>
//! thePoint1 - the start point of a segment (base point) <br>
//! thePoint2 - the end point of a segment <br>
//! thePointToCheck - the point to classify <br>
Standard_Integer classifyPoint( const gp_XY& thePoint1,
const gp_XY& thePoint2,
const gp_XY& thePointToCheck ) const;
//! Checks intersection between the two segments. <br>
IntFlag intSegSeg( const BRepMesh_Edge& theEdge1,
const BRepMesh_Edge& theEdge2,
const Standard_Boolean isConsiderEndPointTouch,
const Standard_Boolean isConsiderPointOnEdge,
gp_Pnt2d& theIntPnt) const;
//! Returns area of the loop of the given polygon defined by <br>
//! indices of its start and end links. <br>
Standard_Real polyArea( const TColStd_SequenceOfInteger& thePolygon,
const Standard_Integer theStartIndex,
const Standard_Integer theEndIndex ) const;
private:
Handle(BRepMesh_DataStructureOfDelaun) myMeshData;
Standard_Boolean myIsPositiveOrientation;
BRepMesh_CircleTool myCircles;
Standard_Integer mySupVert[3];
BRepMesh_Triangle mySupTrian;
};
#endif

43
src/BRepMesh/BRepMesh_Delaun.lxx
View File

@ -1,43 +0,0 @@
// Created on: 1993-08-19
// Created by: Didier PIFFAULT
// Copyright (c) 1993-1999 Matra Datavision
// Copyright (c) 1999-2012 OPEN CASCADE SAS
//
// The content of this file is subject to the Open CASCADE Technology Public
// License Version 6.5 (the "License"). You may not use the content of this file
// except in compliance with the License. Please obtain a copy of the License
// at http://www.opencascade.org and read it completely before using this file.
//
// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
//
// The Original Code and all software distributed under the License is
// distributed on an "AS IS" basis, without warranty of any kind, and the
// Initial Developer hereby disclaims all such warranties, including without
// limitation, any warranties of merchantability, fitness for a particular
// purpose or non-infringement. Please see the License for the specific terms
// and conditions governing the rights and limitations under the License.
#include <BRepMesh_DataStructureOfDelaun.hxx>
inline const BRepMesh_Vertex& BRepMesh_Delaun::GetVertex
(const Standard_Integer vIndex) const
{
return myMeshData->GetNode(vIndex);
}
inline const BRepMesh_Edge& BRepMesh_Delaun::GetEdge
(const Standard_Integer eIndex) const
{
return myMeshData->GetLink(eIndex);
}
inline const BRepMesh_Triangle& BRepMesh_Delaun::GetTriangle
(const Standard_Integer tIndex) const
{
return myMeshData->GetElement(tIndex);
}

4
src/BRepMesh/BRepMesh_FastDiscret.cxx
View File

@ -323,8 +323,8 @@ void BRepMesh_FastDiscret::Add(const TopoDS_Face& theface,
Standard_Real aUmin, aVmin, aUmax, aVmax;
BRepTools::UVBounds (theface, aUmin, aUmax, aVmin, aVmax);
Standard_Real aTolU = (aUmax - aUmin) * UVDEFLECTION;
Standard_Real aTolV = (aVmax - aVmin) * UVDEFLECTION;
Standard_Real aTolU = Max( Precision::PConfusion(), (aUmax - aUmin) * UVDEFLECTION );
Standard_Real aTolV = Max( Precision::PConfusion(), (aVmax - aVmin) * UVDEFLECTION );
myStructure->Data().SetCellSize ( 14 * aTolU, 14 * aTolV );
myStructure->Data().SetTolerance( aTolU, aTolV );

7
src/BRepMesh/BRepMesh_FastDiscretFace.cxx
View File

@ -135,8 +135,8 @@ void BRepMesh_FastDiscretFace::Add(const TopoDS_Face& theFace
Standard_Real vmax = myAttrib->GetVMax();
Standard_Real vmin = myAttrib->GetVMin();
Standard_Real aTolU = (umax - umin) * UVDEFLECTION;
Standard_Real aTolV = (vmax - vmin) * UVDEFLECTION;
Standard_Real aTolU = Max( Precision::PConfusion(), (umax - umin) * UVDEFLECTION );
Standard_Real aTolV = Max( Precision::PConfusion(), (vmax - vmin) * UVDEFLECTION );
Standard_Real uCellSize = 14 * aTolU;
Standard_Real vCellSize = 14 * aTolV;
@ -249,7 +249,7 @@ void BRepMesh_FastDiscretFace::Add(const TopoDS_Face& theFace
BRepMesh_Delaun trigu(myStructure, tabvert_corr, orFace==TopAbs_FORWARD);
//removed all free edges from triangulation
Standard_Integer nbLinks = myStructure->NbNodes();
Standard_Integer nbLinks = myStructure->NbLinks();
for( i = 1; i <= nbLinks; i++ )
{
if( myStructure->ElemConnectedTo(i).Extent() < 1 )
@ -257,6 +257,7 @@ void BRepMesh_FastDiscretFace::Add(const TopoDS_Face& theFace
BRepMesh_Edge& anEdge = (BRepMesh_Edge&)trigu.GetEdge(i);
if ( anEdge.Movability() == BRepMesh_Deleted )
continue;
anEdge.SetMovability(BRepMesh_Free);
myStructure->RemoveLink(i);
}

7
src/BRepMesh/BRepMesh_MapOfInteger.hxx
View File

@ -15,6 +15,13 @@
// purpose or non-infringement. Please see the License for the specific terms
// and conditions governing the rights and limitations under the License.
#ifndef BRepMesh_MapOfInteger_HeaderFile
#define BRepMesh_MapOfInteger_HeaderFile
#include <NCollection_Map.hxx>
#include <NCollection_Handle.hxx>
typedef NCollection_Map<Standard_Integer> BRepMesh_MapOfInteger;
typedef NCollection_Handle<BRepMesh_MapOfInteger> Handle(BRepMesh_MapOfInteger);
#endif

87
src/BRepMesh/BRepMesh_Triangle.cdl
View File

@ -1,87 +0,0 @@
-- Created on: 1993-09-22
-- Created by: Didier PIFFAULT
-- Copyright (c) 1993-1999 Matra Datavision
-- Copyright (c) 1999-2012 OPEN CASCADE SAS
--
-- The content of this file is subject to the Open CASCADE Technology Public
-- License Version 6.5 (the "License"). You may not use the content of this file
-- except in compliance with the License. Please obtain a copy of the License
-- at http://www.opencascade.org and read it completely before using this file.
--
-- The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
-- main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
--
-- The Original Code and all software distributed under the License is
-- distributed on an "AS IS" basis, without warranty of any kind, and the
-- Initial Developer hereby disclaims all such warranties, including without
-- limitation, any warranties of merchantability, fitness for a particular
-- purpose or non-infringement. Please see the License for the specific terms
-- and conditions governing the rights and limitations under the License.
class Triangle from BRepMesh
---Purpose:
uses Boolean from Standard,
Integer from Standard,
DegreeOfFreedom from BRepMesh
is Create returns Triangle from BRepMesh;
Create (e1, e2, e3 : Integer from Standard;
o1, o2, o3 : Boolean from Standard;
canMove : DegreeOfFreedom from BRepMesh)
returns Triangle from BRepMesh;
Initialize (me : in out;
e1, e2, e3 : Integer from Standard;
o1, o2, o3 : Boolean from Standard;
canMove : DegreeOfFreedom from BRepMesh)
is static;
Edges (me;
e1, e2, e3 : out Integer from Standard;
o1, o2, o3 : out Boolean from Standard)
is static;
Movability (me)
---C++: inline
returns DegreeOfFreedom from BRepMesh
is static;
SetMovability (me : in out;
Move : DegreeOfFreedom from BRepMesh)
is static;
HashCode (me;
Upper : Integer from Standard)
returns Integer from Standard
---C++: function call
is static;
IsEqual (me; Other : Triangle from BRepMesh)
returns Boolean from Standard
---C++: alias operator ==
is static;
fields Edge1 : Integer from Standard;
Orientation1 : Boolean from Standard;
Edge2 : Integer from Standard;
Orientation2 : Boolean from Standard;
Edge3 : Integer from Standard;
Orientation3 : Boolean from Standard;
myMovability : DegreeOfFreedom from BRepMesh;
end Triangle;

158
src/BRepMesh/BRepMesh_Triangle.cxx
View File

@ -18,78 +18,128 @@
// purpose or non-infringement. Please see the License for the specific terms
// and conditions governing the rights and limitations under the License.
#include <BRepMesh_Triangle.hxx>
#include <BRepMesh_Triangle.ixx>
//=======================================================================
//function : Constructor
//purpose :
//=======================================================================
BRepMesh_Triangle::BRepMesh_Triangle()
: Edge1(0), Edge2(0), Edge3(0), myMovability(BRepMesh_Free)
{}
BRepMesh_Triangle::BRepMesh_Triangle (const Standard_Integer e1,
const Standard_Integer e2,
const Standard_Integer e3,
const Standard_Boolean o1,
const Standard_Boolean o2,
const Standard_Boolean o3,
const BRepMesh_DegreeOfFreedom canMove)
: Edge1(e1), Orientation1(o1),Edge2(e2), Orientation2(o2),
Edge3(e3), Orientation3(o3),
myMovability(canMove)
{}
void BRepMesh_Triangle::Initialize(const Standard_Integer e1,
const Standard_Integer e2,
const Standard_Integer e3,
const Standard_Boolean o1,
const Standard_Boolean o2,
const Standard_Boolean o3,
const BRepMesh_DegreeOfFreedom canMove)
: myEdge1(0),
myEdge2(0),
myEdge3(0),
myMovability(BRepMesh_Free)
{
Edge1 =e1;
Edge2 =e2;
Edge3 =e3;
Orientation1 =o1;
Orientation2 =o2;
Orientation3 =o3;
myMovability =canMove;
}
void BRepMesh_Triangle::Edges(Standard_Integer& e1,
Standard_Integer& e2,
Standard_Integer& e3,
Standard_Boolean& o1,
Standard_Boolean& o2,
Standard_Boolean& o3)const
//=======================================================================
//function : Constructor
//purpose :
//=======================================================================
BRepMesh_Triangle::BRepMesh_Triangle (const Standard_Integer theEdge1,
const Standard_Integer theEdge2,
const Standard_Integer theEdge3,
const Standard_Boolean theOrientation1,
const Standard_Boolean theOrientation2,
const Standard_Boolean theOrientation3,
const BRepMesh_DegreeOfFreedom isCanMove)
: myEdge1(theEdge1),
myEdge2(theEdge2),
myEdge3(theEdge3),
myOrientation1(theOrientation1),
myOrientation2(theOrientation2),
myOrientation3(theOrientation3),
myMovability(isCanMove)
{
e1=Edge1;
e2=Edge2;
e3=Edge3;
o1=Orientation1;
o2=Orientation2;
o3=Orientation3;
}
void BRepMesh_Triangle::SetMovability(const BRepMesh_DegreeOfFreedom Move)
//=======================================================================
//function : Initialize
//purpose :
//=======================================================================
void BRepMesh_Triangle::Initialize(const Standard_Integer theEdge1,
const Standard_Integer theEdge2,
const Standard_Integer theEdge3,
const Standard_Boolean theOrientation1,
const Standard_Boolean theOrientation2,
const Standard_Boolean theOrientation3,
const BRepMesh_DegreeOfFreedom isCanMove)
{
myMovability =Move;
myEdge1 = theEdge1;
myEdge2 = theEdge2;
myEdge3 = theEdge3;
myOrientation1 = theOrientation1;
myOrientation2 = theOrientation2;
myOrientation3 = theOrientation3;
myMovability = isCanMove;
}
Standard_Integer BRepMesh_Triangle::HashCode
(const Standard_Integer Upper)const
//=======================================================================
//function : Edges
//purpose :
//=======================================================================
void BRepMesh_Triangle::Edges(Standard_Integer& theEdge1,
Standard_Integer& theEdge2,
Standard_Integer& theEdge3,
Standard_Boolean& theOrientation1,
Standard_Boolean& theOrientation2,
Standard_Boolean& theOrientation3) const
{
return ::HashCode(Edge1+Edge2+Edge3, Upper);
theEdge1 = myEdge1;
theEdge2 = myEdge2;
theEdge3 = myEdge3;
theOrientation1 = myOrientation1;
theOrientation2 = myOrientation2;
theOrientation3 = myOrientation3;
}
Standard_Boolean BRepMesh_Triangle::IsEqual
(const BRepMesh_Triangle& Other)const
//=======================================================================
//function : SetMovability
//purpose :
//=======================================================================
void BRepMesh_Triangle::SetMovability(const BRepMesh_DegreeOfFreedom theMovability)
{
if (myMovability==BRepMesh_Deleted || Other.myMovability==BRepMesh_Deleted)
myMovability = theMovability;
}
//=======================================================================
//function : HashCode
//purpose :
//=======================================================================
Standard_Integer BRepMesh_Triangle::HashCode(const Standard_Integer theUpper)const
{
return ::HashCode(myEdge1 + myEdge2 + myEdge3, theUpper);
}
//=======================================================================
//function : IsEqual
//purpose :
//=======================================================================
Standard_Boolean BRepMesh_Triangle::IsEqual(const BRepMesh_Triangle& theOther) const
{
if (myMovability == BRepMesh_Deleted || theOther.myMovability == BRepMesh_Deleted)
return Standard_False;
if (Edge1==Other.Edge1 && Edge2==Other.Edge2 && Edge3==Other.Edge3)
if (myEdge1 == theOther.myEdge1 &&
myEdge2 == theOther.myEdge2 &&
myEdge3 == theOther.myEdge3)
{
return Standard_True;
if (Edge1==Other.Edge2 && Edge2==Other.Edge3 && Edge3==Other.Edge1)
}
if (myEdge1 == theOther.myEdge2 &&
myEdge2 == theOther.myEdge3 &&
myEdge3 == theOther.myEdge1)
{
return Standard_True;
if (Edge1==Other.Edge3 && Edge2==Other.Edge1 && Edge3==Other.Edge2)
}
if (myEdge1 == theOther.myEdge3 &&
myEdge2 == theOther.myEdge1 &&
myEdge3 == theOther.myEdge2)
{
return Standard_True;
}
return Standard_False;
}

95
src/BRepMesh/BRepMesh_Triangle.hxx Normal file
View File

@ -0,0 +1,95 @@
// Created on: 1993-09-23
// Created by: Didier PIFFAULT
// Copyright (c) 1993-1999 Matra Datavision
// Copyright (c) 1999-2012 OPEN CASCADE SAS
//
// The content of this file is subject to the Open CASCADE Technology Public
// License Version 6.5 (the "License"). You may not use the content of this file
// except in compliance with the License. Please obtain a copy of the License
// at http://www.opencascade.org and read it completely before using this file.
//
// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
//
// The Original Code and all software distributed under the License is
// distributed on an "AS IS" basis, without warranty of any kind, and the
// Initial Developer hereby disclaims all such warranties, including without
// limitation, any warranties of merchantability, fitness for a particular
// purpose or non-infringement. Please see the License for the specific terms
// and conditions governing the rights and limitations under the License.
#ifndef _BRepMesh_Triangle_HeaderFile
#define _BRepMesh_Triangle_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Macro.hxx>
#include <BRepMesh_DegreeOfFreedom.hxx>
class BRepMesh_Triangle {
public:
DEFINE_STANDARD_ALLOC
Standard_EXPORT BRepMesh_Triangle();
Standard_EXPORT BRepMesh_Triangle(const Standard_Integer theEdge1,
const Standard_Integer theEdge2,
const Standard_Integer theEdge3,
const Standard_Boolean theOrientation1,
const Standard_Boolean theOrientation2,
const Standard_Boolean theOrientation3,
const BRepMesh_DegreeOfFreedom isCanMove);
Standard_EXPORT void Initialize(const Standard_Integer theEdge1,
const Standard_Integer theEdge2,
const Standard_Integer theEdge3,
const Standard_Boolean theOrientation1,
const Standard_Boolean theOrientation2,
const Standard_Boolean theOrientation3,
const BRepMesh_DegreeOfFreedom isCanMove) ;
Standard_EXPORT void Edges(Standard_Integer& theEdge1,
Standard_Integer& theEdge2,
Standard_Integer& theEdge3,
Standard_Boolean& theOrientation1,
Standard_Boolean& theOrientation2,
Standard_Boolean& theOrientation3) const;
inline BRepMesh_DegreeOfFreedom Movability() const
{
return myMovability;
}
Standard_EXPORT void SetMovability(const BRepMesh_DegreeOfFreedom theMovability) ;
Standard_EXPORT Standard_Integer HashCode(const Standard_Integer theUpper) const;
Standard_EXPORT Standard_Boolean IsEqual(const BRepMesh_Triangle& theOther) const;
Standard_Boolean operator ==(const BRepMesh_Triangle& theOther) const
{
return IsEqual(theOther);
}
private:
Standard_Integer myEdge1;
Standard_Boolean myOrientation1;
Standard_Integer myEdge2;
Standard_Boolean myOrientation2;
Standard_Integer myEdge3;
Standard_Boolean myOrientation3;
BRepMesh_DegreeOfFreedom myMovability;
};
// Inline functions
inline Standard_Integer HashCode(const BRepMesh_Triangle& theTriangle,
const Standard_Integer theUpper)
{
return theTriangle.HashCode(theUpper);
}
#endif

25
src/BRepMesh/BRepMesh_Triangle.lxx
View File

@ -1,25 +0,0 @@
// Created on: 1993-09-23
// Created by: Didier PIFFAULT
// Copyright (c) 1993-1999 Matra Datavision
// Copyright (c) 1999-2012 OPEN CASCADE SAS
//
// The content of this file is subject to the Open CASCADE Technology Public
// License Version 6.5 (the "License"). You may not use the content of this file
// except in compliance with the License. Please obtain a copy of the License
// at http://www.opencascade.org and read it completely before using this file.
//
// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
//
// The Original Code and all software distributed under the License is
// distributed on an "AS IS" basis, without warranty of any kind, and the
// Initial Developer hereby disclaims all such warranties, including without
// limitation, any warranties of merchantability, fitness for a particular
// purpose or non-infringement. Please see the License for the specific terms
// and conditions governing the rights and limitations under the License.
inline BRepMesh_DegreeOfFreedom BRepMesh_Triangle::Movability()const
{
return myMovability;
}

4
src/BRepMesh/FILES
View File

@ -1,7 +1,11 @@
BRepMesh_PluginEntryType.hxx
BRepMesh_PluginMacro.hxx
BRepMesh_Triangle.hxx
BRepMesh_Triangle.cxx
BRepMesh_ClassifierPtr.hxx
BRepMesh_CellFilter.hxx
BRepMesh_Delaun.hxx
BRepMesh_Delaun.cxx
BRepMesh_CircleInspector.hxx
BRepMesh_MapOfIntegerInteger.hxx
BRepMesh_MapOfInteger.hxx

25
tests/bugs/mesh/bug23105 Executable file
View File

@ -0,0 +1,25 @@
puts "================"
puts "CR23105"
puts "================"
puts ""
###############################################
## Exception during Meshing / Missing triangles
###############################################
restore [locate_data_file bug23105_f372.brep] result
checkshape result
incmesh result 0.1
set trinfo_s [trinfo result]
regexp {([0-9]+) triangles} $trinfo_s str nbtri_s
regexp {deflection ([0-9.+e-]+)} $trinfo_s str defl_s
# check deflections
if { $defl_s > 0.1 } {
puts "Error: too big deflection ($defl_s > 0.1)"
}
# compare number of triangles
if { $nbtri_s == 0 } {
puts "Error: shape contains 0 triangles"
}

2
tests/mesh/data/standard/C7
View File

@ -3,5 +3,7 @@ set bug_freenodes "OCC22687"
if { [string compare $command "shading"] == 0 } {
set nbfreenodes(All) 1
} else {
set bug_freelinks "OCC23105"
set nbfree(ALL) 4
set nbfreenodes(All) 4
}

4
tests/mesh/data/standard/C9
View File

@ -1 +1,5 @@
set TheFileName shading_027.brep
##if { [string compare $command "shading"] != 0 } {
set bug_freenodes "OCC23105"
set nbfreenodes(All) 3
##}

4
tests/mesh/data/standard/Q6
View File

@ -3,7 +3,7 @@ set bug_freenodes "OCC22687"
if { [string compare $command "shading"] == 0 } {
set nbfreenodes(All) 9
} else {
set bug_freelinks "OCC22687"
set nbfree(All) 3
## set bug_freelinks "OCC22687"
## set nbfree(All) 3
set nbfreenodes(All) 5
}

4
tests/mesh/data/standard/U2
View File

@ -3,9 +3,13 @@ set bug_area "OCC22687"
set rel_tol 1.9
set bug_withouttri "OCC22687"
if { [string compare $command "shading"] == 0 } {
puts "TODO OCC23105 ALL: Error: Improvement: The current area difference is"
set nbwithouttri(All) 1
set bug_freenodes "OCC22687"
set nbfreenodes(All) 38
} else {
set nbwithouttri(All) 1
set bug_freenodes "OCC23105"
set nbfreenodes(ALL) 1
}

7
tests/mesh/data/standard/U4
View File

@ -3,6 +3,9 @@ if { [string compare $command "shading"] == 0 } {
set bug_withouttri "OCC22687"
set nbwithouttri(All) 1
} else {
set bug_freenodes "OCC22687"
set nbfreenodes(All) 5
## set bug_freenodes "OCC22687"
## set nbfreenodes(All) 5
set bug_withouttri "OCC23105"
set nbwithouttri(All) 1
}

4
tests/mesh/data/standard/U5
View File

@ -4,6 +4,6 @@ if { [string compare $command "shading"] == 0 } {
set nbfreenodes(All) 6
} else {
set nbfreenodes(All) 2
set bug_freelinks "OCC22687"
set nbfree(All) 8
## set bug_freelinks "OCC22687"
## set nbfree(All) 8
}

23
tests/mesh/data/standard/U7
View File

@ -16,9 +16,12 @@ if { [string compare $command "shading"] == 0 } {
|| [string compare $os "Debian40"] == 0
} {
set nbl 19
} else {
set nbl 17
set nbfree($os) $nbl
## else
## set nbl 17
}
set nbwithouttri($os) $nbt
set nbfreenodes($os) $nbn
} else {
if {
[string compare $os "Mandriva2010"] == 0
@ -26,12 +29,16 @@ if { [string compare $command "shading"] == 0 } {
set nbt 14
set nbn 83
set nbl 19
} else {
set nbt 15
set nbn 60
set nbl 2
}
}
set nbwithouttri($os) $nbt
set nbfree($os) $nbl
set nbfreenodes($os) $nbn
} else {
set bug_withouttri "OCC23105"
set nbt 14
set nbn 60
## set nbl 2
set nbwithouttri($os) $nbt
## set nbfree($os) $nbl
set nbfreenodes($os) $nbn
}
}

3
tests/mesh/data/standard/V4
View File

@ -1,3 +1,6 @@
set TheFileName shading_wrongshape_015.brep
set bug_withouttri "OCC22687"
set bug_freenodes "OCC23105"
set nbfreenodes(ALL) 4
set nbwithouttri(All) 6

2
tests/mesh/data/standard/W4
View File

@ -23,7 +23,7 @@ if { [string compare $command "mesh"] == 0 } {
set os $env(os_type)
}
set bug_freelinks "OCC22687"
if {[string compare $os "Mandriva2008"] == 0 || [string compare $os "Mandriva2010"] == 0 || [string compare $os "Debian40"] == 0} {
if {[string compare $os "Mandriva2008"] == 0 || [string compare $os "Mandriva2010"] == 0 || [string compare $os "Debian40"] == 0 || [string compare $os "Debian60-64"] == 0 || [string compare $os "windows"] == 0} {
set nb 4
} else {
set nb 6

4
tests/mesh/data/standard/W9
View File

@ -3,7 +3,11 @@ set bug_withouttri "OCC22687"
set nbwithouttri(All) 1
set bug_freelinks "OCC22687"
if { [string compare $command "shading"] == 0 } {
set bug_freenodes "OCC23105"
set nbfreenodes(ALL) 2
set nbfree(ALL) 12
} else {
set bug_freenodes "OCC23105"
set nbfreenodes(ALL) 2
set nbfree(ALL) 8
}