Skip to content

Commit

Permalink
improve geometry processing
Browse files Browse the repository at this point in the history
  • Loading branch information
@ifcquery
ifcquery committed Jul 11, 2023
1 parent 3d47f5c commit d46787f
Show file tree
Hide file tree
Showing 944 changed files with 14,073 additions and 158,634 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,4 @@ IfcPlusPlus/src/ifcpp-
IfcPlusPlus/src/ifcpp--
IfcPlusPlus/src/ifcpp---/
IfcPlusPlus/src/ifcpp----/
examples/LoadFileExample/dump_mesh_debug.txt
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ INSTALL(
IF(BUILD_CONSOLE_APPLICATION)
ADD_SUBDIRECTORY (examples/CreateIfcWallAndWriteFile)
ADD_SUBDIRECTORY (examples/LoadFileExample)
ADD_SUBDIRECTORY (examples/LoadFileWithGeometryExample)
ENDIF()
IF(BUILD_VIEWER_APPLICATION)
ADD_SUBDIRECTORY (examples/SimpleViewerExampleQt)
Expand Down
24 changes: 0 additions & 24 deletions IfcPlusPlus/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,6 @@ set(IFCPP_SOURCE_FILES
src/ifcpp/writer/WriterUtil.cpp
src/ifcpp/geometry/MeshOps.cpp
src/ifcpp/geometry/GeometryInputData.cpp
src/external/manifold/src/boolean3.cpp
src/external/manifold/src/boolean_result.cpp
src/external/manifold/src/collider/src/collider.cpp
src/external/manifold/src/constructors.cpp
src/external/manifold/src/csg_tree.cpp
src/external/manifold/src/edge_op.cpp
src/external/manifold/src/face_op.cpp
src/external/manifold/src/impl.cpp
src/external/manifold/src/manifold.cpp
src/external/manifold/src/polygon/src/polygon.cpp
src/external/manifold/src/properties.cpp
src/external/manifold/src/smoothing.cpp
src/external/manifold/src/sort.cpp
src/external/manifold/src/third_party/graphlite/src/connected_components.cpp
src/external/manifold/src/utilities/src/detect_cuda.cpp
src/external/Carve/src/lib/aabb.cpp
src/external/Carve/src/lib/carve.cpp
src/external/Carve/src/lib/convex_hull.cpp
Expand Down Expand Up @@ -116,15 +101,6 @@ TARGET_INCLUDE_DIRECTORIES(IfcPlusPlus
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/Carve/src/common
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/Carve/build/src
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/glm
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/utilities/include
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/utilities
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/polygon/include
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/manifold/include
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/collider/include
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/third_party
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/third_party/thrust
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/third_party/graphlite/include
)


Expand Down
28 changes: 6 additions & 22 deletions IfcPlusPlus/IfcPlusPlus.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;src/external/manifold/src/utilities/include;src/external/manifold/src/utilities;src/external/manifold/src/polygon/include;src/external/manifold/src/manifold/include;src/external/manifold/src;src\external\manifold\src\collider\include;src/external/manifold/src/third_party;src/external/manifold/src/third_party/thrust;src/external/manifold/src/third_party/graphlite/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WINDOWS;UNICODE;WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_MBCS;IFCPP_AS_DYNAMIC_LIBRARY;IFCPP_LIB;GLM_FORCE_CTOR_INIT;GLM_FORCE_XYZW_ONLY;THRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_CPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
Expand All @@ -173,7 +173,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.;.\src;src\ifcpp;src\ifcpp\IFC4X3\include;.\src\external\;.\src\external\RapidJSON;.\src\external\glm;src/external/Carve;src/external/Carve/src;src/external/Carve/src/common;src/external/Carve/src/lib;src/external/Carve/src/include;src/external/Carve/src/include/carve;src/external/manifold/src/utilities/include;src/external/manifold/src/utilities;src/external/manifold/src/polygon/include;src/external/manifold/src/manifold/include;src/external/manifold/src;src\external\manifold\src\collider\include;src/external/manifold/src/third_party;src/external/manifold/src/third_party/thrust;src/external/manifold/src/third_party/graphlite/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;.\src;src\ifcpp;src\ifcpp\IFC4X3\include;.\src\external\;.\src\external\RapidJSON;.\src\external\glm;src/external/Carve;src/external/Carve/src;src/external/Carve/src/common;src/external/Carve/src/lib;src/external/Carve/src/include;src/external/Carve/src/include/carve;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_WINDOWS;WINDOWS;UNICODE;WIN32;WIN64;_DEBUG;_CRT_SECURE_NO_WARNINGS;_MBCS;GLM_FORCE_CTOR_INIT;GLM_FORCE_XYZW_ONLY;THRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_CPP;IFCQUERY_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
Expand Down Expand Up @@ -206,7 +206,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;src/external/manifold/src/utilities/include;src/external/manifold/src/utilities;src/external/manifold/src/polygon/include;src/external/manifold/src/manifold/include;src/external/manifold/src;src\external\manifold\src\collider\include;src/external/manifold/src/third_party;src/external/manifold/src/third_party/thrust;src/external/manifold/src/third_party/graphlite/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;IFCQUERY_AS_DYNAMIC_LIBRARY;IFCQUERY_LIB;GLM_FORCE_CTOR_INIT;GLM_FORCE_XYZW_ONLY;THRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_CPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand Down Expand Up @@ -252,7 +252,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>false</IntrinsicFunctions>
<AdditionalIncludeDirectories>.;.\src;src\ifcpp;src\ifcpp\IFC4X3\include;.\src\external\;.\src\external\RapidJSON;.\src\external\glm;src/external/Carve;src/external/Carve/src;src/external/Carve/src/common;src/external/Carve/src/lib;src/external/Carve/src/include;src/external/Carve/src/include/carve;src/external/manifold/src/utilities/include;src/external/manifold/src/utilities;src/external/manifold/src/polygon/include;src/external/manifold/src/manifold/include;src/external/manifold/src;src\external\manifold\src\collider\include;src/external/manifold/src/third_party;src/external/manifold/src/third_party/thrust;src/external/manifold/src/third_party/graphlite/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>.;.\src;src\ifcpp;src\ifcpp\IFC4X3\include;.\src\external\;.\src\external\RapidJSON;.\src\external\glm;src/external/Carve;src/external/Carve/src;src/external/Carve/src/common;src/external/Carve/src/lib;src/external/Carve/src/include;src/external/Carve/src/include/carve;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;IFCQUERY_LIB;GLM_FORCE_CTOR_INIT;GLM_FORCE_XYZW_ONLY;THRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_CPP;IFCQUERY_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
Expand Down Expand Up @@ -300,7 +300,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;src/external/manifold/src/utilities/include;src/external/manifold/src/utilities;src/external/manifold/src/polygon/include;src/external/manifold/src/manifold/include;src/external/manifold/src;src\external\manifold\src\collider\include;src/external/manifold/src/third_party;src/external/manifold/src/third_party/thrust;src/external/manifold/src/third_party/graphlite/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;GLM_FORCE_CTOR_INIT;GLM_FORCE_XYZW_ONLY;THRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_CPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
Expand All @@ -323,7 +323,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;src/external/manifold/src/utilities/include;src/external/manifold/src/utilities;src/external/manifold/src/polygon/include;src/external/manifold/src/manifold/include;src/external/manifold/src;src\external\manifold\src\collider\include;src/external/manifold/src/third_party;src/external/manifold/src/third_party/thrust;src/external/manifold/src/third_party/graphlite/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;GLM_FORCE_CTOR_INIT;GLM_FORCE_XYZW_ONLY;THRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_CPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
Expand All @@ -341,7 +341,6 @@
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\external\zip-master\zip.c" />
<ClCompile Include="src\ifcpp\geometry\GeometryInputData.cpp" />
<ClCompile Include="src\ifcpp\geometry\MeshOps.cpp" />
<ClCompile Include="src\ifcpp\IFC4X3\EntityFactory.cpp">
Expand All @@ -358,21 +357,6 @@
<ClCompile Include="src\ifcpp\reader\ReaderUtil.cpp" />
<ClCompile Include="src\ifcpp\writer\WriterSTEP.cpp" />
<ClCompile Include="src\ifcpp\writer\WriterUtil.cpp" />
<ClCompile Include="src\external\manifold\src\boolean3.cpp" />
<ClCompile Include="src\external\manifold\src\boolean_result.cpp" />
<ClCompile Include="src\external\manifold\src\collider\src\collider.cpp" />
<ClCompile Include="src\external\manifold\src\constructors.cpp" />
<ClCompile Include="src\external\manifold\src\csg_tree.cpp" />
<ClCompile Include="src\external\manifold\src\edge_op.cpp" />
<ClCompile Include="src\external\manifold\src\face_op.cpp" />
<ClCompile Include="src\external\manifold\src\impl.cpp" />
<ClCompile Include="src\external\manifold\src\manifold.cpp" />
<ClCompile Include="src\external\manifold\src\polygon\src\polygon.cpp" />
<ClCompile Include="src\external\manifold\src\properties.cpp" />
<ClCompile Include="src\external\manifold\src\smoothing.cpp" />
<ClCompile Include="src\external\manifold\src\sort.cpp" />
<ClCompile Include="src\external\manifold\src\third_party\graphlite\src\connected_components.cpp" />
<ClCompile Include="src\external\manifold\src\utilities\src\detect_cuda.cpp" />
<ClCompile Include="src\external\Carve\src\common\geometry.cpp" />
<ClCompile Include="src\external\Carve\src\lib\aabb.cpp" />
<ClCompile Include="src\external\Carve\src\lib\carve.cpp" />
Expand Down
49 changes: 1 addition & 48 deletions IfcPlusPlus/IfcPlusPlus.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,51 +185,7 @@
<ClCompile Include="src\ifcpp\IFC4X3\TypeFactory.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\boolean3.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\boolean_result.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\collider\src\collider.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\constructors.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\csg_tree.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\edge_op.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\face_op.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\impl.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\manifold.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\polygon\src\polygon.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\properties.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\smoothing.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\sort.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\third_party\graphlite\src\connected_components.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\manifold\src\utilities\src\detect_cuda.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>

<ClCompile Include="src\external\Carve\src\common\geometry.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
Expand Down Expand Up @@ -317,9 +273,6 @@
<ClCompile Include="src\external\Carve\src\lib\triangulator.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\external\zip-master\zip.c">
<Filter>Quelldateien</Filter>
</ClCompile>
<ClCompile Include="src\ifcpp\geometry\MeshOps.cpp">
<Filter>Quelldateien</Filter>
</ClCompile>
Expand Down
9 changes: 0 additions & 9 deletions IfcPlusPlus/src/external/manifold/AUTHORS
View file

This file was deleted.

35 changes: 0 additions & 35 deletions IfcPlusPlus/src/external/manifold/CMakeLists.txt
View file

This file was deleted.

29 changes: 0 additions & 29 deletions IfcPlusPlus/src/external/manifold/CONTRIBUTING.md
View file

This file was deleted.

Loading

0 comments on commit d46787f

Please sign in to comment.