Skip to content

Commit 547c67b

Browse files
committed
fix bug in geometry processing. add struct GeomProcessingParams
1 parent 7dec87b commit 547c67b

File tree

1,489 files changed

+3267
-5277
lines changed

Some content is hidden

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

1,489 files changed

+3267
-5277
lines changed

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

+355-298
Large diffs are not rendered by default.

IfcPlusPlus/src/external/manifold/src/utilities/include/public.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
namespace manifold {
3434

35-
constexpr float kTolerance = 1e-5;
35+
constexpr float kTolerance = 1e-5f;
3636

3737
#ifdef __CUDACC__
3838
#define HOST_DEVICE __host__ __device__

IfcPlusPlus/src/ifcpp/IFC4X3/EntityFactory.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@
880880
#include "lib/IfcZone.cpp"
881881
#include "EntityFactory.h"
882882

883-
static std::map<std::string, std::function<BuildingEntity*( void )> > entity_factory_map = {
883+
static std::map<std::string, std::function<BuildingEntity*( void )> > entity_factory_map = {
884884
{ "IFCACTIONREQUEST", []()->BuildingEntity* { return new IFC4X3::IfcActionRequest(); } },
885885
{ "IFCACTOR", []()->BuildingEntity* { return new IFC4X3::IfcActor(); } },
886886
{ "IFCACTORROLE", []()->BuildingEntity* { return new IFC4X3::IfcActorRole(); } },
@@ -1755,8 +1755,7 @@
17551755
{ "IFCWORKSCHEDULE", []()->BuildingEntity* { return new IFC4X3::IfcWorkSchedule(); } },
17561756
{ "IFCWORKTIME", []()->BuildingEntity* { return new IFC4X3::IfcWorkTime(); } },
17571757
{ "IFCZSHAPEPROFILEDEF", []()->BuildingEntity* { return new IFC4X3::IfcZShapeProfileDef(); } },
1758-
{ "IFCZONE", []()->BuildingEntity* { return new IFC4X3::IfcZone(); } }
1759-
};
1758+
{ "IFCZONE", []()->BuildingEntity* { return new IFC4X3::IfcZone(); } }};
17601759

17611760
BuildingEntity* IFC4X3::EntityFactory::createEntityObject( const std::string& class_name_upper )
17621761
{

IfcPlusPlus/src/ifcpp/IFC4X3/TypeFactory.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@
444444
#include "lib/IfcWorkScheduleTypeEnum.cpp"
445445
#include "TypeFactory.h"
446446

447-
static std::map<std::string, std::function<shared_ptr<BuildingObject>( const std::string&, const std::map<int, shared_ptr<BuildingEntity> >&, std::stringstream& )> > type_factory_map = {
447+
static std::map<std::string, std::function<shared_ptr<BuildingObject>( const std::string&, const std::map<int, shared_ptr<BuildingEntity> >&, std::stringstream& )> > type_factory_map = {
448448
{ "IFCABSORBEDDOSEMEASURE", []( const std::string& arg, const std::map<int, shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )->shared_ptr<BuildingObject> { return IFC4X3::IfcAbsorbedDoseMeasure::createObjectFromSTEP( arg, map, errorStream ); } },
449449
{ "IFCACCELERATIONMEASURE", []( const std::string& arg, const std::map<int, shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )->shared_ptr<BuildingObject> { return IFC4X3::IfcAccelerationMeasure::createObjectFromSTEP( arg, map, errorStream ); } },
450450
{ "IFCACTIONREQUESTTYPEENUM", []( const std::string& arg, const std::map<int, shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )->shared_ptr<BuildingObject> { return IFC4X3::IfcActionRequestTypeEnum::createObjectFromSTEP( arg, map, errorStream ); } },
@@ -883,8 +883,7 @@
883883
{ "IFCWINDOWTYPEPARTITIONINGENUM", []( const std::string& arg, const std::map<int, shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )->shared_ptr<BuildingObject> { return IFC4X3::IfcWindowTypePartitioningEnum::createObjectFromSTEP( arg, map, errorStream ); } },
884884
{ "IFCWORKCALENDARTYPEENUM", []( const std::string& arg, const std::map<int, shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )->shared_ptr<BuildingObject> { return IFC4X3::IfcWorkCalendarTypeEnum::createObjectFromSTEP( arg, map, errorStream ); } },
885885
{ "IFCWORKPLANTYPEENUM", []( const std::string& arg, const std::map<int, shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )->shared_ptr<BuildingObject> { return IFC4X3::IfcWorkPlanTypeEnum::createObjectFromSTEP( arg, map, errorStream ); } },
886-
{ "IFCWORKSCHEDULETYPEENUM", []( const std::string& arg, const std::map<int, shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )->shared_ptr<BuildingObject> { return IFC4X3::IfcWorkScheduleTypeEnum::createObjectFromSTEP( arg, map, errorStream ); } }
887-
};
886+
{ "IFCWORKSCHEDULETYPEENUM", []( const std::string& arg, const std::map<int, shared_ptr<BuildingEntity> >& map, std::stringstream& errorStream )->shared_ptr<BuildingObject> { return IFC4X3::IfcWorkScheduleTypeEnum::createObjectFromSTEP( arg, map, errorStream ); } }};
888887

889888
shared_ptr<BuildingObject> IFC4X3::TypeFactory::createTypeObject( const std::string& class_name_upper, const std::string& type_arg, const std::map<int, shared_ptr<BuildingEntity> >& map_entities, std::stringstream& errorStream )
890889
{

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAbsorbedDoseMeasure.h

-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ namespace IFC4X3
2424
double m_value;
2525
};
2626
}
27-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAccelerationMeasure.h

-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ namespace IFC4X3
2424
double m_value;
2525
};
2626
}
27-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcActionRequest.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace IFC4X3
1515
class IFCQUERY_EXPORT IfcText;
1616
//ENTITY
1717
class IFCQUERY_EXPORT IfcActionRequest : public IfcControl
18-
{
18+
{
1919
public:
2020
IfcActionRequest() = default;
2121
IfcActionRequest( int id );
@@ -68,4 +68,3 @@ namespace IFC4X3
6868
shared_ptr<IfcText> m_LongDescription; //optional
6969
};
7070
}
71-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcActionRequestTypeEnum.h

-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@ namespace IFC4X3
3434
IfcActionRequestTypeEnumEnum m_enum;
3535
};
3636
}
37-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcActionSourceTypeEnum.h

-1
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,3 @@ namespace IFC4X3
5454
IfcActionSourceTypeEnumEnum m_enum;
5555
};
5656
}
57-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcActionTypeEnum.h

-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,3 @@ namespace IFC4X3
3232
IfcActionTypeEnumEnum m_enum;
3333
};
3434
}
35-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcActor.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace IFC4X3
1414
class IFCQUERY_EXPORT IfcRelAssignsToActor;
1515
//ENTITY
1616
class IFCQUERY_EXPORT IfcActor : public IfcObject
17-
{
17+
{
1818
public:
1919
IfcActor() = default;
2020
IfcActor( int id );
@@ -61,4 +61,3 @@ namespace IFC4X3
6161
std::vector<weak_ptr<IfcRelAssignsToActor> > m_IsActingUpon_inverse;
6262
};
6363
}
64-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcActorRole.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace IFC4X3
1616
class IFCQUERY_EXPORT IfcExternalReferenceRelationship;
1717
//ENTITY
1818
class IFCQUERY_EXPORT IfcActorRole : virtual public IfcResourceObjectSelect, public BuildingEntity
19-
{
19+
{
2020
public:
2121
IfcActorRole() = default;
2222
IfcActorRole( int id );
@@ -39,4 +39,3 @@ namespace IFC4X3
3939
std::vector<weak_ptr<IfcExternalReferenceRelationship> > m_HasExternalReference_inverse;
4040
};
4141
}
42-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcActuator.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcActuatorTypeEnum;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcActuator : public IfcDistributionControlElement
16-
{
16+
{
1717
public:
1818
IfcActuator() = default;
1919
IfcActuator( int id );
@@ -92,4 +92,3 @@ namespace IFC4X3
9292
shared_ptr<IfcActuatorTypeEnum> m_PredefinedType; //optional
9393
};
9494
}
95-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcActuatorType.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcActuatorTypeEnum;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcActuatorType : public IfcDistributionControlElementType
16-
{
16+
{
1717
public:
1818
IfcActuatorType() = default;
1919
IfcActuatorType( int id );
@@ -71,4 +71,3 @@ namespace IFC4X3
7171
shared_ptr<IfcActuatorTypeEnum> m_PredefinedType;
7272
};
7373
}
74-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcActuatorTypeEnum.h

-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@ namespace IFC4X3
3434
IfcActuatorTypeEnumEnum m_enum;
3535
};
3636
}
37-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAddress.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace IFC4X3
1717
class IFCQUERY_EXPORT IfcOrganization;
1818
//ENTITY
1919
class IFCQUERY_EXPORT IfcAddress : virtual public IfcObjectReferenceSelect, public BuildingEntity
20-
{
20+
{
2121
public:
2222
IfcAddress() = default;
2323
IfcAddress( int id );
@@ -41,4 +41,3 @@ namespace IFC4X3
4141
std::vector<weak_ptr<IfcOrganization> > m_OfOrganization_inverse;
4242
};
4343
}
44-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAddressTypeEnum.h

-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,3 @@ namespace IFC4X3
3232
IfcAddressTypeEnumEnum m_enum;
3333
};
3434
}
35-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAdvancedBrep.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace IFC4X3
1212
{
1313
//ENTITY
1414
class IFCQUERY_EXPORT IfcAdvancedBrep : public IfcManifoldSolidBrep
15-
{
15+
{
1616
public:
1717
IfcAdvancedBrep() = default;
1818
IfcAdvancedBrep( int id );
@@ -42,4 +42,3 @@ namespace IFC4X3
4242
// IfcAdvancedBrep -----------------------------------------------------------
4343
};
4444
}
45-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAdvancedBrepWithVoids.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcClosedShell;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcAdvancedBrepWithVoids : public IfcAdvancedBrep
16-
{
16+
{
1717
public:
1818
IfcAdvancedBrepWithVoids() = default;
1919
IfcAdvancedBrepWithVoids( int id );
@@ -47,4 +47,3 @@ namespace IFC4X3
4747
std::vector<shared_ptr<IfcClosedShell> > m_Voids;
4848
};
4949
}
50-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAdvancedFace.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace IFC4X3
1212
{
1313
//ENTITY
1414
class IFCQUERY_EXPORT IfcAdvancedFace : public IfcFaceSurface
15-
{
15+
{
1616
public:
1717
IfcAdvancedFace() = default;
1818
IfcAdvancedFace( int id );
@@ -47,4 +47,3 @@ namespace IFC4X3
4747
// IfcAdvancedFace -----------------------------------------------------------
4848
};
4949
}
50-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAirTerminal.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcAirTerminalTypeEnum;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcAirTerminal : public IfcFlowTerminal
16-
{
16+
{
1717
public:
1818
IfcAirTerminal() = default;
1919
IfcAirTerminal( int id );
@@ -94,4 +94,3 @@ namespace IFC4X3
9494
shared_ptr<IfcAirTerminalTypeEnum> m_PredefinedType; //optional
9595
};
9696
}
97-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAirTerminalBox.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcAirTerminalBoxTypeEnum;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcAirTerminalBox : public IfcFlowController
16-
{
16+
{
1717
public:
1818
IfcAirTerminalBox() = default;
1919
IfcAirTerminalBox( int id );
@@ -94,4 +94,3 @@ namespace IFC4X3
9494
shared_ptr<IfcAirTerminalBoxTypeEnum> m_PredefinedType; //optional
9595
};
9696
}
97-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAirTerminalBoxType.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcAirTerminalBoxTypeEnum;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcAirTerminalBoxType : public IfcFlowControllerType
16-
{
16+
{
1717
public:
1818
IfcAirTerminalBoxType() = default;
1919
IfcAirTerminalBoxType( int id );
@@ -73,4 +73,3 @@ namespace IFC4X3
7373
shared_ptr<IfcAirTerminalBoxTypeEnum> m_PredefinedType;
7474
};
7575
}
76-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAirTerminalBoxTypeEnum.h

-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,3 @@ namespace IFC4X3
3232
IfcAirTerminalBoxTypeEnumEnum m_enum;
3333
};
3434
}
35-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAirTerminalType.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcAirTerminalTypeEnum;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcAirTerminalType : public IfcFlowTerminalType
16-
{
16+
{
1717
public:
1818
IfcAirTerminalType() = default;
1919
IfcAirTerminalType( int id );
@@ -73,4 +73,3 @@ namespace IFC4X3
7373
shared_ptr<IfcAirTerminalTypeEnum> m_PredefinedType;
7474
};
7575
}
76-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAirTerminalTypeEnum.h

-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,3 @@ namespace IFC4X3
3333
IfcAirTerminalTypeEnumEnum m_enum;
3434
};
3535
}
36-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAirToAirHeatRecovery.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcAirToAirHeatRecoveryTypeEnum;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcAirToAirHeatRecovery : public IfcEnergyConversionDevice
16-
{
16+
{
1717
public:
1818
IfcAirToAirHeatRecovery() = default;
1919
IfcAirToAirHeatRecovery( int id );
@@ -94,4 +94,3 @@ namespace IFC4X3
9494
shared_ptr<IfcAirToAirHeatRecoveryTypeEnum> m_PredefinedType; //optional
9595
};
9696
}
97-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAirToAirHeatRecoveryType.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcAirToAirHeatRecoveryTypeEnum;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcAirToAirHeatRecoveryType : public IfcEnergyConversionDeviceType
16-
{
16+
{
1717
public:
1818
IfcAirToAirHeatRecoveryType() = default;
1919
IfcAirToAirHeatRecoveryType( int id );
@@ -73,4 +73,3 @@ namespace IFC4X3
7373
shared_ptr<IfcAirToAirHeatRecoveryTypeEnum> m_PredefinedType;
7474
};
7575
}
76-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAirToAirHeatRecoveryTypeEnum.h

-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,3 @@ namespace IFC4X3
3838
IfcAirToAirHeatRecoveryTypeEnumEnum m_enum;
3939
};
4040
}
41-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAlarm.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcAlarmTypeEnum;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcAlarm : public IfcDistributionControlElement
16-
{
16+
{
1717
public:
1818
IfcAlarm() = default;
1919
IfcAlarm( int id );
@@ -92,4 +92,3 @@ namespace IFC4X3
9292
shared_ptr<IfcAlarmTypeEnum> m_PredefinedType; //optional
9393
};
9494
}
95-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAlarmType.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcAlarmTypeEnum;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcAlarmType : public IfcDistributionControlElementType
16-
{
16+
{
1717
public:
1818
IfcAlarmType() = default;
1919
IfcAlarmType( int id );
@@ -71,4 +71,3 @@ namespace IFC4X3
7171
shared_ptr<IfcAlarmTypeEnum> m_PredefinedType;
7272
};
7373
}
74-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAlarmTypeEnum.h

-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,3 @@ namespace IFC4X3
3737
IfcAlarmTypeEnumEnum m_enum;
3838
};
3939
}
40-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAlignment.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcAlignmentTypeEnum;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcAlignment : public IfcLinearPositioningElement
16-
{
16+
{
1717
public:
1818
IfcAlignment() = default;
1919
IfcAlignment( int id );
@@ -74,4 +74,3 @@ namespace IFC4X3
7474
shared_ptr<IfcAlignmentTypeEnum> m_PredefinedType; //optional
7575
};
7676
}
77-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAlignmentCant.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace IFC4X3
1313
class IFCQUERY_EXPORT IfcPositiveLengthMeasure;
1414
//ENTITY
1515
class IFCQUERY_EXPORT IfcAlignmentCant : public IfcLinearElement
16-
{
16+
{
1717
public:
1818
IfcAlignmentCant() = default;
1919
IfcAlignmentCant( int id );
@@ -69,4 +69,3 @@ namespace IFC4X3
6969
shared_ptr<IfcPositiveLengthMeasure> m_RailHeadDistance;
7070
};
7171
}
72-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAlignmentCantSegment.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace IFC4X3
1515
class IFCQUERY_EXPORT IfcAlignmentCantSegmentTypeEnum;
1616
//ENTITY
1717
class IFCQUERY_EXPORT IfcAlignmentCantSegment : public IfcAlignmentParameterSegment
18-
{
18+
{
1919
public:
2020
IfcAlignmentCantSegment() = default;
2121
IfcAlignmentCantSegment( int id );
@@ -45,4 +45,3 @@ namespace IFC4X3
4545
shared_ptr<IfcAlignmentCantSegmentTypeEnum> m_PredefinedType;
4646
};
4747
}
48-

IfcPlusPlus/src/ifcpp/IFC4X3/include/IfcAlignmentCantSegmentTypeEnum.h

-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@ namespace IFC4X3
3434
IfcAlignmentCantSegmentTypeEnumEnum m_enum;
3535
};
3636
}
37-

0 commit comments

Comments
 (0)