kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Mesh: [skip ci] change MeshTopoAlgorithm::SplitOpenEdge to return a boolean to indicate if the operation succeeded or not

Browse Source
This commit is contained in:
wmayer
2021-09-25 14:52:49 +02:00
parent e94d7c32b5
commit bd46e970d9
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/Mesh/App/Core/TopoAlgorithm.cpp
View File

@@ -121,9 +121,7 @@ bool MeshTopoAlgorithm::SnapVertex(FacetIndex ulFacetPos, const Base::Vector3f&
// Point is on the edge
if ( cNo3.Length() < FLOAT_EPS )
{
unsigned long uCt = _rclMesh.CountFacets();
SplitOpenEdge(ulFacetPos, i, rP);
return uCt < _rclMesh.CountFacets();
return SplitOpenEdge(ulFacetPos, i, rP);
}
else if ( (rP - rPt1)*cNo2 > 0.0f && fD2 >= fTV && fTV >= 0.0f )
{
@@ -719,18 +717,18 @@ bool MeshTopoAlgorithm::SplitEdge(FacetIndex ulFacetPos, FacetIndex ulNeighbour,
return true;
}
void MeshTopoAlgorithm::SplitOpenEdge(FacetIndex ulFacetPos, unsigned short uSide, const Base::Vector3f& rP)
bool MeshTopoAlgorithm::SplitOpenEdge(FacetIndex ulFacetPos, unsigned short uSide, const Base::Vector3f& rP)
{
MeshFacet& rclF = _rclMesh._aclFacetArray[ulFacetPos];
if (rclF._aulNeighbours[uSide] != FACET_INDEX_MAX)
return; // not open
return false; // not open
PointIndex uPtCnt = _rclMesh._aclPointArray.size();
PointIndex uPtInd = this->GetOrAddIndex(rP);
FacetIndex ulSize = _rclMesh._aclFacetArray.size();
if (uPtInd < uPtCnt)
return; // the given point is already part of the mesh => creating new facets would be an illegal operation
return false; // the given point is already part of the mesh => creating new facets would be an illegal operation
// adjust the neighbourhood
if (rclF._aulNeighbours[(uSide+1)%3] != FACET_INDEX_MAX)
@@ -750,6 +748,7 @@ void MeshTopoAlgorithm::SplitOpenEdge(FacetIndex ulFacetPos, unsigned short uSid
// insert new facets
_rclMesh._aclFacetArray.push_back(cNew);
return true;
}
bool MeshTopoAlgorithm::Vertex_Less::operator ()(const Base::Vector3f& u,

2
src/Mod/Mesh/App/Core/TopoAlgorithm.h
View File

@@ -99,7 +99,7 @@ public:
* point \a rP must be near to this edge and must not be coincident with any
* corner vertices of the facet.
*/
void SplitOpenEdge(FacetIndex ulFacetPos, unsigned short uSide,
bool SplitOpenEdge(FacetIndex ulFacetPos, unsigned short uSide,
const Base::Vector3f& rP);
/**
* Splits the facet with index \a ulFacetPos into up to three facets. The points