surfaceFeatureExtract: Refactored pointIndexHitList functionality into corresponding core classes

This commit is contained in:
Henry Weller
2018-04-10 23:08:56 +01:00
parent 388b3107c8
commit 3e1ab675f6
10 changed files with 197 additions and 200 deletions

View File

@ -475,9 +475,9 @@ int main(int argc, char *argv[])
scalarField featureProximity(surf.size(), searchDistance);
forAll(surf, fI)
forAll(surf, fi)
{
const triPointRef& tri = surf[fI].tri(surf.points());
const triPointRef& tri = surf[fi].tri(surf.points());
const point& triCentre = tri.circumCentre();
const scalar radiusSqr = min
@ -486,26 +486,21 @@ int main(int argc, char *argv[])
sqr(searchDistance)
);
List<pointIndexHit> hitList;
pointIndexHitList hitList;
feMesh.allNearestFeatureEdges(triCentre, radiusSqr, hitList);
featureProximity[fI] =
calcProximityOfFeatureEdges
(
feMesh,
hitList,
featureProximity[fI]
);
featureProximity[fi] = min
(
feMesh.minDisconnectedDist(hitList),
featureProximity[fi]
);
feMesh.allNearestFeaturePoints(triCentre, radiusSqr, hitList);
featureProximity[fI] =
calcProximityOfFeaturePoints
(
hitList,
featureProximity[fI]
);
featureProximity[fi] = min
(
minDist(hitList),
featureProximity[fi]
);
}
triSurfaceScalarField featureProximityField