Skip to content

Commit 89a93c6

Browse files
ifcqueryifcquery
committed
fix remove comments in header
1 parent 8293682 commit 89a93c6

File tree

7 files changed

+71
-39
lines changed

7 files changed

+71
-39
lines changed

‎IfcPlusPlus.sln

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
2-
# Visual Studio Version 16
3-
VisualStudioVersion = 16.0.31025.194
2+
# Visual Studio Version 17
3+
VisualStudioVersion = 17.9.34714.143
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IfcPlusPlus", "IfcPlusPlus\IfcPlusPlus.vcxproj", "{9700AD93-4F6B-484A-BA34-FC4C97E5C645}"
66
EndProject
@@ -28,8 +28,8 @@ Global
2828
HideSolutionNode = FALSE
2929
EndGlobalSection
3030
GlobalSection(ExtensibilityGlobals) = postSolution
31-
SolutionGuid = {EE8FBA93-1179-406C-B2C6-2445EBDB28A8}
32-
QtVersion = 5.7.1
3331
Qt5Version = 5.7.1
32+
QtVersion = 5.7.1
33+
SolutionGuid = {EE8FBA93-1179-406C-B2C6-2445EBDB28A8}
3434
EndGlobalSection
3535
EndGlobal

‎IfcPlusPlus/IfcPlusPlus.vcxproj

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
</PropertyGroup>
8484
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithDebugInfo|x64'" Label="Configuration">
8585
<ConfigurationType>StaticLibrary</ConfigurationType>
86-
<UseDebugLibraries>false</UseDebugLibraries>
87-
<PlatformToolset>v142</PlatformToolset>
88-
<WholeProgramOptimization>true</WholeProgramOptimization>
86+
<UseDebugLibraries>true</UseDebugLibraries>
87+
<PlatformToolset>v143</PlatformToolset>
88+
<WholeProgramOptimization>false</WholeProgramOptimization>
8989
<CharacterSet>Unicode</CharacterSet>
9090
</PropertyGroup>
9191
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimization|x64'" Label="Configuration">
@@ -296,23 +296,28 @@
296296
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithDebugInfo|x64'">
297297
<ClCompile>
298298
<WarningLevel>Level3</WarningLevel>
299-
<Optimization>MaxSpeed</Optimization>
299+
<Optimization>Full</Optimization>
300300
<FunctionLevelLinking>true</FunctionLevelLinking>
301301
<IntrinsicFunctions>true</IntrinsicFunctions>
302-
<AdditionalIncludeDirectories>src;../Carve/src/;../Carve/src/include;../Carve/src/common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
302+
<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>
303303
<MultiProcessorCompilation>true</MultiProcessorCompilation>
304-
<PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
304+
<PreprocessorDefinitions>UNICODE;WIN32;_WINDOWS;NDEBUG;_MBCS;IFCQUERY_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
305305
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
306306
<FloatingPointExceptions>true</FloatingPointExceptions>
307307
<RuntimeTypeInfo>true</RuntimeTypeInfo>
308+
<LanguageStandard>stdcpp20</LanguageStandard>
309+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
310+
<WholeProgramOptimization>false</WholeProgramOptimization>
311+
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
308312
</ClCompile>
309313
<Link>
310314
<GenerateDebugInformation>true</GenerateDebugInformation>
311315
<EnableCOMDATFolding>true</EnableCOMDATFolding>
312316
<OptimizeReferences>true</OptimizeReferences>
313317
</Link>
314318
<Lib>
315-
<LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
319+
<LinkTimeCodeGeneration>
320+
</LinkTimeCodeGeneration>
316321
</Lib>
317322
</ItemDefinitionGroup>
318323
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNoOptimization|x64'">
@@ -345,9 +350,11 @@
345350
<ClCompile Include="src\ifcpp\geometry\SolidModelConverter.cpp" />
346351
<ClCompile Include="src\ifcpp\IFC4X3\EntityFactory.cpp">
347352
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
353+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='ReleaseWithDebugInfo|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
348354
</ClCompile>
349355
<ClCompile Include="src\ifcpp\IFC4X3\TypeFactory.cpp">
350356
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
357+
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='ReleaseWithDebugInfo|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
351358
</ClCompile>
352359
<ClCompile Include="src\ifcpp\model\AttributeObject.cpp" />
353360
<ClCompile Include="src\ifcpp\model\BuildingGuid.cpp" />

‎IfcPlusPlus/src/ifcpp/geometry/ConverterOSG.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,12 @@ class ConverterOSG : public StatusCallback
232232
normals->resize(num_vertices, poly_normal);
233233

234234
osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry();
235-
235+
236236
if (m_caching_enabled) {
237237
osg::Vec3Array* cachedVertexArray = findExistingVertexArray(vertices);
238238
geometry->setVertexArray(cachedVertexArray);
239239
}
240-
else{
240+
else {
241241
geometry->setVertexArray(vertices);
242242
}
243243
geometry->setNormalArray(normals);
@@ -563,14 +563,14 @@ class ConverterOSG : public StatusCallback
563563
if (vertices_quad->size() > 0)
564564
{
565565
osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry();
566-
if( m_caching_enabled){
566+
if (m_caching_enabled) {
567567
osg::Vec3Array* cachedVertexArray = findExistingVertexArray(vertices_quad);
568568
geometry->setVertexArray(cachedVertexArray);
569569
}
570-
else{
570+
else {
571571
geometry->setVertexArray(vertices_quad);
572572
}
573-
573+
574574
if (normals_quad)
575575
{
576576
normals_quad->setBinding(osg::Array::BIND_PER_VERTEX);
@@ -639,11 +639,11 @@ class ConverterOSG : public StatusCallback
639639
}
640640

641641
osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry();
642-
if( m_caching_enabled){
642+
if (m_caching_enabled) {
643643
osg::Vec3Array* cachedVertexArray = findExistingVertexArray(vertices);
644644
geometry->setVertexArray(cachedVertexArray);
645645
}
646-
else{
646+
else {
647647
geometry->setVertexArray(vertices);
648648
}
649649
geometry->addPrimitiveSet(new osg::DrawArrays(osg::PrimitiveSet::LINE_STRIP, 0, vertices->size()));
@@ -730,11 +730,11 @@ class ConverterOSG : public StatusCallback
730730
}
731731

732732
osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry();
733-
if( m_caching_enabled){
733+
if (m_caching_enabled) {
734734
osg::Vec3Array* cachedVertexArray = findExistingVertexArray(vertices);
735735
geometry->setVertexArray(cachedVertexArray);
736736
}
737-
else{
737+
else {
738738
geometry->setVertexArray(vertices);
739739
}
740740
geometry->setName("creaseEdges");

‎IfcPlusPlus/src/ifcpp/geometry/Sweeper.h

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ class Sweeper : public StatusCallback
339339
#ifdef _DEBUG
340340
if (params.ifc_entity)
341341
{
342-
if (params.ifc_entity->m_tag == 1271765)
342+
if (params.ifc_entity->m_tag == 9817817 && false )
343343
{
344344
vec4 color(0.3, 0.4, 0.5, 1.0);
345345
shared_ptr<carve::input::PolyhedronData> poly_data(new carve::input::PolyhedronData());
@@ -503,15 +503,11 @@ class Sweeper : public StatusCallback
503503
#ifdef _DEBUG
504504
std::string details = "";
505505
bool correct = checkPolyhedronData(polyhedronResult, params, details);
506-
std::vector<int>& faceIndices = polyhedronResult->faceIndices;
507-
if (!correct)
508-
{
509-
std::cout << "incorrect extrusion result";
506+
if (!correct) {
507+
shared_ptr<carve::mesh::MeshSet<3> > meshset(polyhedronResult->createMesh(carve::input::opts(), eps));
508+
vec4 color(0.3, 0.4, 0.5, 1.0);
509+
GeomDebugDump::dumpMeshset(meshset, color, 0, true, false);
510510
}
511-
512-
shared_ptr<carve::mesh::MeshSet<3> > meshset(polyhedronResult->createMesh(carve::input::opts(), eps));
513-
vec4 color(0.3, 0.4, 0.5, 1.0);
514-
GeomDebugDump::dumpMeshset(meshset, color, 0, true, false);
515511
#endif
516512
itemData->addClosedPolyhedron(polyhedronResult, params);
517513
}

‎IfcPlusPlus/src/ifcpp/reader/ReaderSTEP.cpp

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,30 @@ void ReaderSTEP::loadModelFromStream(std::istream& content, std::streampos file_
184184
progressValueCallback(progress, "parse");
185185
}
186186

187+
void removeComments(std::string& line)
188+
{
189+
for (size_t ii = 0; ii < line.size(); ++ii)
190+
{
191+
size_t found_comment_start = line.find("/*");
192+
if (found_comment_start == std::string::npos)
193+
{
194+
break;
195+
}
196+
size_t found_comment_end = line.find("*/");
197+
if (found_comment_end != std::string::npos)
198+
{
199+
if (found_comment_end > found_comment_start)
200+
{
201+
line.erase(found_comment_start, found_comment_end - found_comment_start + 2);
202+
}
203+
}
204+
else
205+
{
206+
line.erase(found_comment_start);
207+
}
208+
}
209+
}
210+
187211
void ReaderSTEP::readHeader(std::istream& content, shared_ptr<BuildingModel>& target_model)
188212
{
189213
if (!target_model)
@@ -221,7 +245,8 @@ void ReaderSTEP::readHeader(std::istream& content, shared_ptr<BuildingModel>& ta
221245
if (found_comment_end > found_comment_start)
222246
{
223247
inComment = false;
224-
continue;
248+
line.erase(found_comment_start, found_comment_end - found_comment_start + 2);
249+
//continue;
225250
}
226251
// TODO: remove comment from line, and check rest of line
227252
}
@@ -267,6 +292,7 @@ void ReaderSTEP::readHeader(std::istream& content, shared_ptr<BuildingModel>& ta
267292
++lineCount;
268293
}
269294

295+
removeComments(strHeader);
270296
target_model->m_ifc_schema_version_loaded_file = BuildingModel::IFC_VERSION_UNDEFINED;
271297
std::vector<std::string> vec_header;
272298
std::vector<std::string> vec_header_str;

‎examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@
6666
<ConfigurationType>Application</ConfigurationType>
6767
<PlatformToolset>v143</PlatformToolset>
6868
<CharacterSet>Unicode</CharacterSet>
69-
<WholeProgramOptimization>true</WholeProgramOptimization>
69+
<WholeProgramOptimization>
70+
</WholeProgramOptimization>
71+
<UseDebugLibraries>true</UseDebugLibraries>
7072
</PropertyGroup>
7173
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7274
<Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
@@ -379,7 +381,8 @@
379381
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
380382
<MultiProcessorCompilation>true</MultiProcessorCompilation>
381383
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
382-
<WholeProgramOptimization>true</WholeProgramOptimization>
384+
<WholeProgramOptimization>
385+
</WholeProgramOptimization>
383386
<FloatingPointExceptions>true</FloatingPointExceptions>
384387
<RuntimeTypeInfo>true</RuntimeTypeInfo>
385388
<BrowseInformation>false</BrowseInformation>
@@ -401,7 +404,7 @@
401404
<OutputFile>$(OutDir)\$(TargetName).exe</OutputFile>
402405
<AdditionalLibraryDirectories>..\..\IfcPlusPlus\bin;$(OSG_DIR)\lib;$(OSG_DIR)\build\lib;$(FREETYPE_DIR)\objs\vc2010\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
403406
<GenerateDebugInformation>true</GenerateDebugInformation>
404-
<AdditionalDependencies>osg.lib;OpenThreads.lib;osgDB.lib;osgFX.lib;osgGA.lib;osgText.lib;osgUtil.lib;osgViewer.lib;IfcPlusPlus.lib;%(AdditionalDependencies)</AdditionalDependencies>
407+
<AdditionalDependencies>osg.lib;OpenThreads.lib;osgDB.lib;osgFX.lib;osgGA.lib;osgText.lib;osgUtil.lib;osgViewer.lib;IfcPlusPlusrd.lib;%(AdditionalDependencies)</AdditionalDependencies>
405408
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
406409
<StackReserveSize>
407410
</StackReserveSize>

‎examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj.user

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@
2525
<LocalDebuggerEnvironment>PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH)</LocalDebuggerEnvironment>
2626
</PropertyGroup>
2727
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
28-
<QtLastBackgroundBuild>2024-04-28T13:31:13.2180423Z</QtLastBackgroundBuild>
28+
<QtLastBackgroundBuild>2024-04-28T15:34:49.2973776Z</QtLastBackgroundBuild>
2929
</PropertyGroup>
3030
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
31-
<QtLastBackgroundBuild>2024-04-28T13:31:13.4544425Z</QtLastBackgroundBuild>
31+
<QtLastBackgroundBuild>2024-04-28T15:34:49.4550337Z</QtLastBackgroundBuild>
3232
</PropertyGroup>
3333
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
34-
<QtLastBackgroundBuild>2024-04-28T13:31:13.6328603Z</QtLastBackgroundBuild>
34+
<QtLastBackgroundBuild>2024-04-28T15:34:49.6528594Z</QtLastBackgroundBuild>
3535
</PropertyGroup>
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithDebugInfo|Win32'" Label="QtSettings">
37-
<QtLastBackgroundBuild>2024-04-28T13:31:12.7888801Z</QtLastBackgroundBuild>
37+
<QtLastBackgroundBuild>2024-04-28T15:34:48.8076472Z</QtLastBackgroundBuild>
3838
</PropertyGroup>
3939
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
40-
<QtLastBackgroundBuild>2024-04-28T13:31:13.9285666Z</QtLastBackgroundBuild>
40+
<QtLastBackgroundBuild>2024-04-28T15:34:49.8299991Z</QtLastBackgroundBuild>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithDebugInfo|x64'" Label="QtSettings">
43-
<QtLastBackgroundBuild>2024-04-28T13:31:13.0857329Z</QtLastBackgroundBuild>
43+
<QtLastBackgroundBuild>2024-04-28T15:34:49.1260649Z</QtLastBackgroundBuild>
4444
</PropertyGroup>
4545
</Project>

0 commit comments

Comments
 (0)