Merge remote-tracking branch 'origin/v0.7.0' into v0.8.0

src/ifcgeom/kernels/opencascade/base_utils.h

@@ -3,9 +3,14 @@
 
 #include "../../../ifcgeom/ConversionResult.h"
 
-#include <gp_Ax3.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
+#include <gp_Ax3.hxx>
+#include <gp_Ax2d.hxx>
+#include <gp_Trsf2d.hxx>
+#include <gp_GTrsf2d.hxx>
+#include <gp_Trsf.hxx>
+#include <gp_GTrsf.hxx>
 
 #include <TopTools_ListOfShape.hxx>
 #include <TopoDS_Wire.hxx>
@@ -72,4 +77,4 @@ namespace IfcGeom {
 	}
 }
 
-#endif
+#endif

src/ifcgeom/kernels/opencascade/boolean_utils.cpp

@@ -620,18 +620,6 @@ bool IfcGeom::util::boolean_subtraction_2d_using_builder(const TopoDS_Shape & a_
 		}
 	}
 
-	{
-		TopoDS_Compound C;
-		BRep_Builder BB;
-		BB.MakeCompound(C);
-		
-		for (auto& w : wires) {
-			BB.Add(C, w);
-		}
-
-		BRepTools::Write(C, "debug.brep");
-	}
-
 	shape_index = 0;
 	edge_index = 0;
 
@@ -1105,6 +1093,9 @@ bool IfcGeom::util::boolean_operation(const boolean_settings& settings, const To
 		if (builder->DSFiller()->HasWarning(STANDARD_TYPE(BOPAlgo_AlertAcquiredSelfIntersection))) {
 			Logger::Notice("Builder reports self-intersection in output");
 			success = false;
+		} else if(builder->DSFiller()->HasWarning(STANDARD_TYPE(BOPAlgo_AlertBadPositioning)) && !TopoDS_Iterator(*builder).More()) {
+			Logger::Notice("Builder reports bad positioning and result is empty");
+			success = false;
 		} else {
 			TopoDS_Shape r = *builder;
 
@@ -1388,4 +1379,4 @@ const TopoDS_Shape& IfcGeom::util::ensure_fit_for_subtraction(const TopoDS_Shape
 	}
 
 	return solid;
-}
+}

src/ifcgeom/kernels/opencascade/wire_utils.cpp

@@ -81,7 +81,11 @@ bool IfcGeom::util::approximate_plane_through_wire(const TopoDS_Wire& wire, gp_P
 	}
 
 	gp_Vec v(x, y, z);
-	if (v.SquareMagnitude() < eps_ * eps_) {
+	// @todo the epsilon passed to us here is the maximum allowed deviation of
+	// the given points to the constructed plane. When doing triangulation and
+	// obtaining a 2d points for the Delaunay, infinity is passed here, so this
+	// can't for assessing degenerativeness.
+	if (v.SquareMagnitude() < 1.e-7) {
 		Logger::Warning("Degenerate face boundary in normal estimation");
 		return false;
 	}