Skip to content

Commit d46787f

Browse files
ifcqueryifcquery
committed
improve geometry processing
1 parent 3d47f5c commit d46787f

File tree

944 files changed

+14073
-158634
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

944 files changed

+14073
-158634
lines changed

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,4 @@ IfcPlusPlus/src/ifcpp-
4949
IfcPlusPlus/src/ifcpp--
5050
IfcPlusPlus/src/ifcpp---/
5151
IfcPlusPlus/src/ifcpp----/
52+
examples/LoadFileExample/dump_mesh_debug.txt

Diff for: ‎CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ INSTALL(
6565
IF(BUILD_CONSOLE_APPLICATION)
6666
ADD_SUBDIRECTORY (examples/CreateIfcWallAndWriteFile)
6767
ADD_SUBDIRECTORY (examples/LoadFileExample)
68-
ADD_SUBDIRECTORY (examples/LoadFileWithGeometryExample)
6968
ENDIF()
7069
IF(BUILD_VIEWER_APPLICATION)
7170
ADD_SUBDIRECTORY (examples/SimpleViewerExampleQt)

Diff for: ‎IfcPlusPlus/CMakeLists.txt

-24
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,6 @@ set(IFCPP_SOURCE_FILES
4040
src/ifcpp/writer/WriterUtil.cpp
4141
src/ifcpp/geometry/MeshOps.cpp
4242
src/ifcpp/geometry/GeometryInputData.cpp
43-
src/external/manifold/src/boolean3.cpp
44-
src/external/manifold/src/boolean_result.cpp
45-
src/external/manifold/src/collider/src/collider.cpp
46-
src/external/manifold/src/constructors.cpp
47-
src/external/manifold/src/csg_tree.cpp
48-
src/external/manifold/src/edge_op.cpp
49-
src/external/manifold/src/face_op.cpp
50-
src/external/manifold/src/impl.cpp
51-
src/external/manifold/src/manifold.cpp
52-
src/external/manifold/src/polygon/src/polygon.cpp
53-
src/external/manifold/src/properties.cpp
54-
src/external/manifold/src/smoothing.cpp
55-
src/external/manifold/src/sort.cpp
56-
src/external/manifold/src/third_party/graphlite/src/connected_components.cpp
57-
src/external/manifold/src/utilities/src/detect_cuda.cpp
5843
src/external/Carve/src/lib/aabb.cpp
5944
src/external/Carve/src/lib/carve.cpp
6045
src/external/Carve/src/lib/convex_hull.cpp
@@ -116,15 +101,6 @@ TARGET_INCLUDE_DIRECTORIES(IfcPlusPlus
116101
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/Carve/src/common
117102
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/Carve/build/src
118103
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/glm
119-
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/utilities/include
120-
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/utilities
121-
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/polygon/include
122-
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/manifold/include
123-
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src
124-
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/collider/include
125-
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/third_party
126-
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/third_party/thrust
127-
${IFCPP_SOURCE_DIR}/IfcPlusPlus/src/external/manifold/src/third_party/graphlite/include
128104
)
129105

130106

Diff for: ‎IfcPlusPlus/IfcPlusPlus.vcxproj

+6-22
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<ClCompile>
159159
<WarningLevel>Level3</WarningLevel>
160160
<Optimization>Disabled</Optimization>
161-
<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>
161+
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
162162
<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>
163163
<MultiProcessorCompilation>true</MultiProcessorCompilation>
164164
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -173,7 +173,7 @@
173173
<ClCompile>
174174
<WarningLevel>Level3</WarningLevel>
175175
<Optimization>Disabled</Optimization>
176-
<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>
176+
<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>
177177
<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>
178178
<MultiProcessorCompilation>true</MultiProcessorCompilation>
179179
<MinimalRebuild>false</MinimalRebuild>
@@ -206,7 +206,7 @@
206206
<Optimization>MaxSpeed</Optimization>
207207
<FunctionLevelLinking>true</FunctionLevelLinking>
208208
<IntrinsicFunctions>true</IntrinsicFunctions>
209-
<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>
209+
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
210210
<MultiProcessorCompilation>true</MultiProcessorCompilation>
211211
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
212212
<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>
@@ -252,7 +252,7 @@
252252
<Optimization>MaxSpeed</Optimization>
253253
<FunctionLevelLinking>true</FunctionLevelLinking>
254254
<IntrinsicFunctions>false</IntrinsicFunctions>
255-
<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>
255+
<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>
256256
<MultiProcessorCompilation>true</MultiProcessorCompilation>
257257
<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>
258258
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
@@ -300,7 +300,7 @@
300300
<Optimization>MaxSpeed</Optimization>
301301
<FunctionLevelLinking>true</FunctionLevelLinking>
302302
<IntrinsicFunctions>true</IntrinsicFunctions>
303-
<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>
303+
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
304304
<MultiProcessorCompilation>true</MultiProcessorCompilation>
305305
<PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;GLM_FORCE_CTOR_INIT;GLM_FORCE_XYZW_ONLY;THRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_CPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
306306
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
@@ -323,7 +323,7 @@
323323
<Optimization>MaxSpeed</Optimization>
324324
<FunctionLevelLinking>true</FunctionLevelLinking>
325325
<IntrinsicFunctions>true</IntrinsicFunctions>
326-
<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>
326+
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
327327
<MultiProcessorCompilation>true</MultiProcessorCompilation>
328328
<PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;GLM_FORCE_CTOR_INIT;GLM_FORCE_XYZW_ONLY;THRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_CPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
329329
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
@@ -341,7 +341,6 @@
341341
</Lib>
342342
</ItemDefinitionGroup>
343343
<ItemGroup>
344-
<ClCompile Include="src\external\zip-master\zip.c" />
345344
<ClCompile Include="src\ifcpp\geometry\GeometryInputData.cpp" />
346345
<ClCompile Include="src\ifcpp\geometry\MeshOps.cpp" />
347346
<ClCompile Include="src\ifcpp\IFC4X3\EntityFactory.cpp">
@@ -358,21 +357,6 @@
358357
<ClCompile Include="src\ifcpp\reader\ReaderUtil.cpp" />
359358
<ClCompile Include="src\ifcpp\writer\WriterSTEP.cpp" />
360359
<ClCompile Include="src\ifcpp\writer\WriterUtil.cpp" />
361-
<ClCompile Include="src\external\manifold\src\boolean3.cpp" />
362-
<ClCompile Include="src\external\manifold\src\boolean_result.cpp" />
363-
<ClCompile Include="src\external\manifold\src\collider\src\collider.cpp" />
364-
<ClCompile Include="src\external\manifold\src\constructors.cpp" />
365-
<ClCompile Include="src\external\manifold\src\csg_tree.cpp" />
366-
<ClCompile Include="src\external\manifold\src\edge_op.cpp" />
367-
<ClCompile Include="src\external\manifold\src\face_op.cpp" />
368-
<ClCompile Include="src\external\manifold\src\impl.cpp" />
369-
<ClCompile Include="src\external\manifold\src\manifold.cpp" />
370-
<ClCompile Include="src\external\manifold\src\polygon\src\polygon.cpp" />
371-
<ClCompile Include="src\external\manifold\src\properties.cpp" />
372-
<ClCompile Include="src\external\manifold\src\smoothing.cpp" />
373-
<ClCompile Include="src\external\manifold\src\sort.cpp" />
374-
<ClCompile Include="src\external\manifold\src\third_party\graphlite\src\connected_components.cpp" />
375-
<ClCompile Include="src\external\manifold\src\utilities\src\detect_cuda.cpp" />
376360
<ClCompile Include="src\external\Carve\src\common\geometry.cpp" />
377361
<ClCompile Include="src\external\Carve\src\lib\aabb.cpp" />
378362
<ClCompile Include="src\external\Carve\src\lib\carve.cpp" />

Diff for: ‎IfcPlusPlus/IfcPlusPlus.vcxproj.filters

+1-48
Original file line numberDiff line numberDiff line change
@@ -185,51 +185,7 @@
185185
<ClCompile Include="src\ifcpp\IFC4X3\TypeFactory.cpp">
186186
<Filter>Quelldateien</Filter>
187187
</ClCompile>
188-
<ClCompile Include="src\external\manifold\src\boolean3.cpp">
189-
<Filter>Quelldateien</Filter>
190-
</ClCompile>
191-
<ClCompile Include="src\external\manifold\src\boolean_result.cpp">
192-
<Filter>Quelldateien</Filter>
193-
</ClCompile>
194-
<ClCompile Include="src\external\manifold\src\collider\src\collider.cpp">
195-
<Filter>Quelldateien</Filter>
196-
</ClCompile>
197-
<ClCompile Include="src\external\manifold\src\constructors.cpp">
198-
<Filter>Quelldateien</Filter>
199-
</ClCompile>
200-
<ClCompile Include="src\external\manifold\src\csg_tree.cpp">
201-
<Filter>Quelldateien</Filter>
202-
</ClCompile>
203-
<ClCompile Include="src\external\manifold\src\edge_op.cpp">
204-
<Filter>Quelldateien</Filter>
205-
</ClCompile>
206-
<ClCompile Include="src\external\manifold\src\face_op.cpp">
207-
<Filter>Quelldateien</Filter>
208-
</ClCompile>
209-
<ClCompile Include="src\external\manifold\src\impl.cpp">
210-
<Filter>Quelldateien</Filter>
211-
</ClCompile>
212-
<ClCompile Include="src\external\manifold\src\manifold.cpp">
213-
<Filter>Quelldateien</Filter>
214-
</ClCompile>
215-
<ClCompile Include="src\external\manifold\src\polygon\src\polygon.cpp">
216-
<Filter>Quelldateien</Filter>
217-
</ClCompile>
218-
<ClCompile Include="src\external\manifold\src\properties.cpp">
219-
<Filter>Quelldateien</Filter>
220-
</ClCompile>
221-
<ClCompile Include="src\external\manifold\src\smoothing.cpp">
222-
<Filter>Quelldateien</Filter>
223-
</ClCompile>
224-
<ClCompile Include="src\external\manifold\src\sort.cpp">
225-
<Filter>Quelldateien</Filter>
226-
</ClCompile>
227-
<ClCompile Include="src\external\manifold\src\third_party\graphlite\src\connected_components.cpp">
228-
<Filter>Quelldateien</Filter>
229-
</ClCompile>
230-
<ClCompile Include="src\external\manifold\src\utilities\src\detect_cuda.cpp">
231-
<Filter>Quelldateien</Filter>
232-
</ClCompile>
188+
233189
<ClCompile Include="src\external\Carve\src\common\geometry.cpp">
234190
<Filter>Quelldateien</Filter>
235191
</ClCompile>
@@ -317,9 +273,6 @@
317273
<ClCompile Include="src\external\Carve\src\lib\triangulator.cpp">
318274
<Filter>Quelldateien</Filter>
319275
</ClCompile>
320-
<ClCompile Include="src\external\zip-master\zip.c">
321-
<Filter>Quelldateien</Filter>
322-
</ClCompile>
323276
<ClCompile Include="src\ifcpp\geometry\MeshOps.cpp">
324277
<Filter>Quelldateien</Filter>
325278
</ClCompile>

Diff for: ‎IfcPlusPlus/src/external/manifold/AUTHORS

-9
This file was deleted.

Diff for: ‎IfcPlusPlus/src/external/manifold/CMakeLists.txt

-35
This file was deleted.

Diff for: ‎IfcPlusPlus/src/external/manifold/CONTRIBUTING.md

-29
This file was deleted.

0 commit comments

Comments
 (0)