- Added InvalidFace checks to overlap mesh generator

Author: paullric

src/OverlapMesh.cpp

@@ -1570,9 +1570,16 @@ int FindFaceContainingNode(
 	if (ixSourceFaceSeed > meshSource.faces.size()) {
 		_EXCEPTIONT("SourceFaceSeed greater than Source mesh size");
 	}
+	if (ixSourceFaceSeed < 0) {
+		_EXCEPTIONT("SourceFaceSeed less than zero");
+	}
 	if (ixTargetFaceSeed > meshTarget.faces.size()) {
 		_EXCEPTIONT("TargetFaceSeed greater than Target mesh size");
 	}
+	if (ixTargetFaceSeed < 0) {
+		_EXCEPTIONT("TargetFaceSeed less than zero");
+
+	}
 
 	const Node & node =
 		meshSource.nodes[meshSource.faces[ixSourceFaceSeed][0]];
@@ -1595,6 +1602,10 @@ int FindFaceContainingNode(
 		int ixCurrentTargetFace = queueTargetFaces.front();
 		queueTargetFaces.pop();
 
+		if (ixCurrentTargetFace == InvalidFace) {
+			continue;
+		}
+
 		const Face & faceTarget = meshTarget.faces[ixCurrentTargetFace];
 
 		utils.ContainsNode(
@@ -1658,7 +1669,8 @@ int FindFaceContainingNode(
 		}
 	}
 
-	_EXCEPTIONT("Unable to find Target Face");
+	return InvalidFace;
+	//_EXCEPTIONT("Unable to find Target Face");
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1705,13 +1717,19 @@ void GenerateOverlapMeshFromFace(
 		_EXCEPTIONT("No target face found");
 	}
 */
+
 	int ixCurrentTargetFace =
 		FindFaceContainingNode<MeshUtilitiesFuzzy, Node>(
 			meshSource,
 			meshTarget,
 			ixSourceFace,
 			ixTargetFaceSeed);
 
+	if (ixCurrentTargetFace == InvalidFace) {
+		std::cout << "\tNo overlapping face found" << std::endl;
+		return;
+	}
+
 	std::cout << "\tFirst overlap match " << ixCurrentTargetFace << std::endl;
 /*
 	// Verify starting Node is not on the Exterior
@@ -1743,6 +1761,9 @@ void GenerateOverlapMeshFromFace(
 		ixCurrentTargetFace = queueTargetFaces.front();
 		queueTargetFaces.pop();
 
+		if (ixCurrentTargetFace == InvalidFace) {
+			_EXCEPTIONT("Logic error");
+		}
 		const Face & faceTarget = meshTarget.faces[ixCurrentTargetFace];
 
 		// Find the overlap polygon
@@ -1785,6 +1806,10 @@ void GenerateOverlapMeshFromFace(
 					_EXCEPTIONT("EdgeMap error");
 				}
 
+				if (iPushFace == InvalidFace) {
+					continue;
+				}
+
 				std::set<int>::const_iterator iterFace =
 					setExaminedTargetFaces.find(iPushFace);
 
@@ -1906,7 +1931,6 @@ void GenerateOverlapMesh_v2(
 	// Calculate Face areas
 	double dTotalAreaOverlap = meshOverlap.CalculateFaceAreas();
 	Announce("Overlap Mesh Geometric Area: %1.15e (%1.15e)", dTotalAreaOverlap, 4.0 * M_PI);
-
 }
 
 ///////////////////////////////////////////////////////////////////////////////