improve CSG processing

ifcquery · Nov 11, 2023 · 2247452 · 2247452
1 parent b2a5466
commit 2247452
Show file tree

Hide file tree

Showing 35 changed files with 2,041 additions and 1,142 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,13 +38,6 @@ ELSE(NOT WIN32)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 ENDIF(NOT WIN32)
 
-find_package(OpenMP)
-if (OPENMP_FOUND)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
-endif()
-
 set(IFCPP_CONFIG_DIR "share/IFCPP/cmake")
 ADD_SUBDIRECTORY (IfcPlusPlus)
 

diff --git a/IfcPlusPlus/CMakeLists.txt b/IfcPlusPlus/CMakeLists.txt
@@ -77,14 +77,6 @@ endif()
 
 add_library(IfcPlusPlus STATIC ${IFCPP_SOURCE_FILES})
 
-if(OpenMP_CXX_FOUND)
-	ADD_DEFINITIONS(-DENABLE_OPENMP)
-    TARGET_LINK_LIBRARIES(IfcPlusPlus 
-		optimized OpenMP::OpenMP_CXX
-		${VC_LIBS})
-endif()
-
-
 TARGET_INCLUDE_DIRECTORIES(IfcPlusPlus
     PRIVATE
 	${CMAKE_CURRENT_SOURCE_DIR}/src

diff --git a/IfcPlusPlus/IfcPlusPlus.vcxproj b/IfcPlusPlus/IfcPlusPlus.vcxproj
@@ -211,7 +211,6 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;IFCQUERY_AS_DYNAMIC_LIBRARY;IFCQUERY_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <OpenMPSupport>true</OpenMPSupport>
       <DebugInformationFormat />
     </ClCompile>
     <Link>
@@ -258,13 +257,11 @@
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <FloatingPointExceptions>true</FloatingPointExceptions>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <OpenMPSupport>
-      </OpenMPSupport>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <AdditionalOptions>
       </AdditionalOptions>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>None</DebugInformationFormat>
       <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
@@ -307,7 +304,6 @@
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <FloatingPointExceptions>true</FloatingPointExceptions>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <OpenMPSupport>true</OpenMPSupport>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -330,7 +326,6 @@
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <FloatingPointExceptions>true</FloatingPointExceptions>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <OpenMPSupport>true</OpenMPSupport>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -426,7 +421,6 @@
     <ClInclude Include="src\ifcpp\model\BuildingModel.h" />
     <ClInclude Include="src\ifcpp\model\BuildingObject.h" />
     <ClInclude Include="src\ifcpp\model\GlobalDefines.h" />
-    <ClInclude Include="src\ifcpp\model\OpenMPIncludes.h" />
     <ClInclude Include="src\ifcpp\model\StatusCallback.h" />
     <ClInclude Include="src\ifcpp\model\UnitConverter.h" />
     <ClInclude Include="src\ifcpp\model\UnknownEntityException.h" />

diff --git a/IfcPlusPlus/IfcPlusPlus.vcxproj.filters b/IfcPlusPlus/IfcPlusPlus.vcxproj.filters
@@ -126,9 +126,6 @@
     <ClInclude Include="src\ifcpp\model\BuildingObject.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="src\ifcpp\model\OpenMPIncludes.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="src\ifcpp\model\BasicTypes.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>

diff --git a/IfcPlusPlus/src/external/Carve/src/include/carve/mesh_impl.hpp b/IfcPlusPlus/src/external/Carve/src/include/carve/mesh_impl.hpp
@@ -341,6 +341,16 @@ carve::geom::vector<ndim> Face<ndim>::computeNormal(double CARVE_EPSILON) {
                 continue;
             }
 
+            if (!edgePtr->v1())
+            {
+                continue;
+            }
+
+            if (!edgePtr->v2())
+            {
+                continue;
+            }
+
             double length2 = edgePtr->length2();
             if (length2 > longestEdgeLength)
             {

diff --git a/IfcPlusPlus/src/external/Carve/src/include/carve/mesh_simplify.hpp b/IfcPlusPlus/src/external/Carve/src/include/carve/mesh_simplify.hpp
@@ -911,8 +911,18 @@ namespace carve {
 						edge_t* e = removed;
 						do {
 							edge_t* n = e->next;
-							coplanar_face_edges.erase(std::min(e, e->rev));
-							delete e->rev;
+							edge_t* erasePtr = std::min(e, e->rev);
+							auto itFind = coplanar_face_edges.find(erasePtr);
+							if (itFind != coplanar_face_edges.end())
+							{
+								coplanar_face_edges.erase(itFind);
+								//coplanar_face_edges.erase(erasePtr);
+							}
+
+							if (e->rev != nullptr)
+							{
+								delete e->rev;
+							}
 							delete e;
 							e = n;
 						} while( e != removed );

diff --git a/IfcPlusPlus/src/external/Carve/src/lib/intersect.cpp b/IfcPlusPlus/src/external/Carve/src/lib/intersect.cpp
@@ -721,7 +721,18 @@ void carve::csg::CSG::_generateEdgeEdgeIntersections(meshset_t::edge_t* ea, mesh
 	carve::geom::aabb<3> ea_aabb, eb_aabb;
 	ea_aabb.fit(v1->v, v2->v);
 	eb_aabb.fit(v3->v, v4->v);
-	if( ea_aabb.maxAxisSeparation(eb_aabb) > m_epsilon ) {
+	double extentLength2 = eb_aabb.extent.length2();
+	double eps2 = m_epsilon * m_epsilon*0.9;
+	if (extentLength2 < eps2)
+	{
+		return;
+	}
+	if (ea_aabb.extent.length2() < eps2)
+	{
+		return;
+	}
+	if( ea_aabb.maxAxisSeparation(eb_aabb) > m_epsilon )
+	{
 		return;
 	}