improve geometry processing

.gitignore

@@ -53,3 +53,5 @@ examples/LoadFileExample/dump_mesh_debug.txt
 examples/CreateIfcWallAndWriteFile/example.ifc
 examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user
 examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user
+.vs/IfcPlusPlus/v17/DocumentLayout.json
+examples/SimpleViewerExampleQt/.vs/SimpleViewerExampleQt/v17/DocumentLayout.json

IfcPlusPlus/CMakeLists.txt

@@ -37,6 +37,7 @@ set(IFCPP_SOURCE_FILES
     src/ifcpp/writer/WriterUtil.cpp
 	src/ifcpp/geometry/MeshOps.cpp
 	src/ifcpp/geometry/GeometryInputData.cpp
+	src/ifcpp/geometry/MeshSimplifier.cpp
 	src/external/Carve/src/lib/aabb.cpp
 	src/external/Carve/src/lib/carve.cpp
 	src/external/Carve/src/lib/convex_hull.cpp

IfcPlusPlus/IfcPlusPlus.vcxproj

@@ -184,7 +184,7 @@
       </DisableSpecificWarnings>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -265,7 +265,7 @@
       <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <DisableSpecificWarnings>4267;4244</DisableSpecificWarnings>
     </ClCompile>
     <Link>
@@ -338,8 +338,10 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="src\ifcpp\geometry\CSG_Adapter.cpp" />
     <ClCompile Include="src\ifcpp\geometry\GeometryInputData.cpp" />
     <ClCompile Include="src\ifcpp\geometry\MeshOps.cpp" />
+    <ClCompile Include="src\ifcpp\geometry\MeshSimplifier.cpp" />
     <ClCompile Include="src\ifcpp\IFC4X3\EntityFactory.cpp">
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>

IfcPlusPlus/IfcPlusPlus.vcxproj.filters

@@ -290,5 +290,11 @@
     <ClCompile Include="src\ifcpp\geometry\GeometryInputData.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="src\ifcpp\geometry\CSG_Adapter.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ifcpp\geometry\MeshSimplifier.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

IfcPlusPlus/src/external/Carve/src/include/carve/aabb.hpp

@@ -71,6 +71,7 @@ struct aabb {
   void expand(double pad);
 
   bool completelyContains(const aabb<ndim>& other) const;
+  bool completelyContains(const aabb<ndim>& other, double eps) const;
 
   bool containsPoint(const vector_t& v) const;
 

IfcPlusPlus/src/external/Carve/src/include/carve/aabb_impl.hpp

@@ -181,6 +181,42 @@ namespace carve {
 			return true;
 		}
 
+		/*
+		* This function checks if the other aabb is completely contained in this aabb
+		* @param other the other aabb
+		* @param eps the epsilon value. If positive, it allows the other aabb to be slightly bigger than this aabb
+		*								If negative, the other aabb must be strictly smaller than this aabb
+		*/
+		template <unsigned ndim>
+		bool aabb<ndim>::completelyContains(const aabb<ndim>& other, double eps) const
+		{
+			//            pos   ext      eps
+			//   ----------|------------|---|
+			//                            
+			//   ----------|-----------------|  other is bigger than this+eps -> false
+
+			//   ----------|--------------|  other is smaller in all dimensions -> true
+
+			for (unsigned i = 0; i < ndim; ++i)
+			{
+				// if max point of other is greater than max point of this, return false
+				double max = pos.v[i] + extent[i];
+				double maxOther = other.pos.v[i] + other.extent[i];
+				if (maxOther > max  + eps)
+				{
+					return false;
+				}
+
+				double min = pos.v[i] - extent[i];
+				double minOther = other.pos.v[i] - other.extent[i];
+				if (minOther < min - eps)
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+
 		template <unsigned ndim>
 		bool aabb<ndim>::containsPoint(const vector_t& v) const {
 			for( unsigned i = 0; i < ndim; ++i ) {

IfcPlusPlus/src/external/Carve/src/include/carve/carve.hpp

@@ -264,3 +264,8 @@ namespace carve {
   MACRO_BEGIN throw carve::exception() << __FILE__ << ":" << __LINE__ << "  " \
                                        << #x;                                 \
   MACRO_END
+
+void printToDebugLogOn(bool on);
+bool IsPrintToDebugLogOn();
+void printToDebugLog(const char* funcName, std::string details);
+void clearDebugLogLinux();

IfcPlusPlus/src/external/Carve/src/include/carve/geom3d.hpp

@@ -26,7 +26,7 @@
 
 #include <carve/carve.hpp>
 #include <carve/geom.hpp>
-
+#include <iostream>
 #include <math.h>
 #include <carve/math_constants.hpp>
 
@@ -299,6 +299,13 @@ namespace carve {
 			double d3 = carve::geom::dotcross(direction, b, base);
 #endif
 
+			if (isnan(d1) || isnan(d2) || isnan(d3))
+			{
+				printToDebugLog( __FUNCTION__, " d1=" +std::to_string( d1) + ", d2=" + std::to_string(d2) +
+					", d3=" + std::to_string(d3 ) );
+			}
+
+
 			// CASE: a and b are coplanar wrt. direction.
 			if( d1 == 0.0 ) {
 				// a and b point in the same direction.
@@ -325,7 +332,7 @@ namespace carve {
 					return -1;
 				}
 				if( d2 > 0.0 && d3 < 0.0 ) {
-					return +1;
+					return 1;
 				}
 
 				// both a and b are to one side of plane(direction, base) -
@@ -342,7 +349,7 @@ namespace carve {
 					return dot(a, base) > 0.0 ? +1 : -1;
 				}
 				else {
-					return dot(a, base) > 0.0 ? -1 : +1;
+					return dot(a, base) > 0.0 ? -1 : 1;
 				}
 			}
 

IfcPlusPlus/src/external/Carve/src/include/carve/geom_impl.hpp

@@ -44,7 +44,7 @@ namespace carve {
 #if defined(CARVE_DEBUG)
 			CARVE_ASSERT(length() > 0.0);
 #endif
-			if( length2() == 0.0 )
+			if( length2() < 1e-16 )
 			{
 				return *this;
 			}

IfcPlusPlus/src/external/Carve/src/include/carve/mesh.hpp

@@ -35,6 +35,10 @@
 
 #include <iostream>
 
+#if defined _DEBUG || defined _DEBUG_RELEASE
+static long globalNumMeshSets = 0;
+#endif
+
 namespace carve {
 	namespace poly {
 		class Polyhedron;
@@ -339,7 +343,7 @@ namespace carve {
 			aabb_t getAABB() const;
 
 			bool recalc(double CARVE_EPSILON);
-			carve::geom::vector<ndim> computeNormal(double CARVE_EPSILON);
+			carve::geom::vector<ndim> computeNormal(double CARVE_EPSILON, bool calledRecursive = false);
 
 			void clearEdges();
 
@@ -630,6 +634,8 @@ namespace carve {
 			bool is_inner_mesh = false;  // completely inside other mesh
 
 			meshset_t* meshset = nullptr;
+			double m_volume = std::numeric_limits<double>::quiet_NaN();
+			void resetVolume() { m_volume = std::numeric_limits<double>::quiet_NaN(); }
 
 		protected:
 			Mesh(std::vector<face_t*>& _faces, std::vector<edge_t*>& _open_edges, std::vector<edge_t*>& _closed_edges, bool _is_negative, bool _is_inner_mesh);
@@ -648,24 +654,30 @@ namespace carve {
 
 			bool isNegative() const { return is_negative; }
 
-			double volume() const 
+			double volume()
 			{
-				if( is_negative || !faces.size() ) {
+				if (is_negative || !faces.size()) {
 					return 0.0;
 				}
 
+				if (!std::isnan(m_volume))
+				{
+					return m_volume;
+				}
+
 				double vol = 0.0;
 				typename vertex_t::vector_t origin = faces[0]->edge->vert->v;
 
-				for( size_t f = 0; f < faces.size(); ++f )
+				for (size_t f = 0; f < faces.size(); ++f)
 				{
 					face_t* face = faces[f];
 					edge_t* e1 = face->edge;
-					for( edge_t* e2 = e1->next; e2->next != e1; e2 = e2->next ) 
+					for (edge_t* e2 = e1->next; e2->next != e1; e2 = e2->next)
 					{
 						vol += carve::geom3d::tetrahedronVolume(e1->vert->v, e2->vert->v, e2->next->vert->v, origin);
 					}
 				}
+				m_volume = vol;
 				return vol;
 			}
 
@@ -728,6 +740,7 @@ namespace carve {
 
 			std::vector<vertex_t> vertex_storage;
 			std::vector<mesh_t*> meshes;
+			//bool m_inner_outer_meshes_classified = false;
 
 		public:
 			template <typename face_type>
@@ -827,17 +840,14 @@ namespace carve {
 
 			MeshSet(const std::vector<typename vertex_t::vector_t>& points, size_t n_faces, const std::vector<int>& face_indices, double CARVE_EPSILON, const MeshOptions& opts = MeshOptions());
 
-			// Construct a mesh set from a set of disconnected faces. Takes
-			// possession of the face pointers.
+			// Construct a mesh set from a set of disconnected faces. Takes possession of the face pointers.
 			MeshSet(std::vector<face_t*>& faces, const MeshOptions& opts = MeshOptions());
 
 			MeshSet(std::list<face_t*>& faces, const MeshOptions& opts = MeshOptions());
 
-			MeshSet(std::vector<vertex_t>& _vertex_storage,
-				std::vector<mesh_t*>& _meshes);
+			MeshSet(std::vector<vertex_t>& _vertex_storage, std::vector<mesh_t*>& _meshes);
 
-			// This constructor consolidates and rewrites vertex pointers in
-			// each mesh, repointing them to local storage.
+			// This constructor consolidates and rewrites vertex pointers in each mesh, repointing them to local storage.
 			MeshSet(std::vector<mesh_t*>& _meshes);
 
 			MeshSet* clone() const;
@@ -864,6 +874,38 @@ namespace carve {
 			void canonicalize();
 
 			void separateMeshes();
+
+			//void classifyInnerOuterMeshes(double eps);
+
+			//double volume(double eps)
+			//{
+			//	if (!m_inner_outer_meshes_classified)
+			//	{
+			//		classifyInnerOuterMeshes(eps);
+			//	}
+
+			//	double vol = 0;
+			//	for (size_t ii = 0; ii < meshes.size(); ++ii)
+			//	{
+			//		carve::mesh::Mesh<ndim>* mesh = meshes[ii];
+			//		double meshVolume = mesh->volume();
+			//		if (meshVolume < 0.0)
+			//		{
+			//			mesh->invert();
+			//			meshVolume = -meshVolume;
+			//		}
+
+			//		if (mesh->is_inner_mesh)
+			//		{
+			//			vol -= meshVolume;
+			//		}
+			//		else
+			//		{
+			//			vol += meshVolume;
+			//		}
+			//	}
+			//	return vol;
+			//}
 		};
 
 		carve::PointClass classifyPoint( const carve::mesh::MeshSet<3>* meshset, const carve::geom::RTreeNode<3, carve::mesh::Face<3>*>* face_rtree,