From 5a7c7ed048f7aaf27f6341bb024611d20d0e6241 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Fri, 18 Jan 2019 16:43:38 +0100 Subject: [PATCH] Shuffle project structure --- cmake/CMakeLists.txt | 45 +++++++++---------- src/examples/IfcAdvancedHouse.cpp | 2 +- src/examples/IfcOpenHouse.cpp | 2 +- src/ifcconvert/IfcConvert.cpp | 6 +-- .../kernels/cgal/CgalConversionResult.h | 2 +- .../kernels/cgal/CgalEntityMapping.cpp | 3 -- src/ifcgeom/kernels/cgal/CgalKernel.cpp | 31 +++++++++---- src/ifcgeom/kernels/cgal/CgalKernel.h | 24 ++++++++-- .../{ => kernels/opencascade}/IfcGeom.h | 25 ++++++----- .../opencascade}/IfcGeomCurves.cpp | 2 +- .../opencascade}/IfcGeomFaces.cpp | 2 +- .../opencascade}/IfcGeomFunctions.cpp | 10 ++--- .../opencascade}/IfcGeomHelpers.cpp | 2 +- .../IfcGeomIteratorImplementation.cpp | 2 +- .../IfcGeomIteratorImplementation.h | 16 +++---- .../opencascade}/IfcGeomRenderStyles.cpp | 0 .../opencascade}/IfcGeomSerialisation.cpp | 0 .../opencascade}/IfcGeomShapeType.h | 0 .../opencascade}/IfcGeomShapes.cpp | 2 +- .../{ => kernels/opencascade}/IfcGeomTree.h | 8 ++-- .../opencascade}/IfcGeomWires.cpp | 2 +- .../{ => kernels/opencascade}/IfcRegister.cpp | 0 .../{ => kernels/opencascade}/IfcRegister.h | 4 +- .../opencascade}/IfcRegisterConvertCurve.h | 0 .../opencascade}/IfcRegisterConvertFace.h | 0 .../opencascade}/IfcRegisterConvertShape.h | 0 .../opencascade}/IfcRegisterConvertShapes.h | 0 .../opencascade}/IfcRegisterConvertWire.h | 0 .../opencascade}/IfcRegisterCreateCache.h | 0 .../opencascade}/IfcRegisterDef.h | 0 .../opencascade}/IfcRegisterGeomHeader.h | 0 .../opencascade}/IfcRegisterPurgeCache.h | 0 .../opencascade}/IfcRegisterShapeType.h | 0 .../opencascade}/IfcRegisterUndef.h | 0 .../OpenCascadeConversionResult.h | 2 +- .../opencascade}/OpenCascadeShape.cpp | 4 +- .../schema_agnostic}/ConversionResult.h | 4 +- .../schema_agnostic}/IfcGeomElement.h | 7 +-- .../schema_agnostic}/IfcGeomFilter.h | 4 +- .../schema_agnostic}/IfcGeomIterator.h | 2 +- .../IfcGeomIteratorSettings.h | 6 +-- .../schema_agnostic}/IfcGeomMaterial.cpp | 0 .../schema_agnostic}/IfcGeomMaterial.h | 2 +- .../schema_agnostic}/IfcGeomRenderStyles.h | 2 +- .../IfcGeomRepresentation.cpp | 4 +- .../schema_agnostic}/IfcGeomRepresentation.h | 6 +-- .../IteratorImplementation.cpp | 0 .../schema_agnostic}/IteratorImplementation.h | 6 +-- .../schema_agnostic}/Kernel.cpp | 3 ++ .../schema_agnostic}/Kernel.h | 9 ++-- .../schema_agnostic}/Serialization.cpp | 0 .../schema_agnostic}/Serialization.h | 5 ++- .../schema_agnostic}/SurfaceStyle.cpp | 2 +- .../schema_agnostic}/ifc_geom_api.h | 0 src/ifcgeomserver/IfcGeomServer.cpp | 4 +- src/ifcparse/IfcParse.h | 2 +- src/ifcwrap/IfcPython.i | 4 +- src/serializers/ColladaSerializer.h | 2 +- src/serializers/GeometrySerializer.h | 4 +- src/serializers/OpenCascadeBasedSerializer.h | 4 +- src/serializers/StepSerializer.h | 2 +- src/serializers/WavefrontObjSerializer.cpp | 2 +- .../schema_dependent/XmlSerializer.cpp | 2 +- 63 files changed, 155 insertions(+), 129 deletions(-) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeom.h (96%) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeomCurves.cpp (99%) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeomFaces.cpp (99%) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeomFunctions.cpp (99%) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeomHelpers.cpp (99%) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeomIteratorImplementation.cpp (95%) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeomIteratorImplementation.h (98%) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeomRenderStyles.cpp (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeomSerialisation.cpp (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeomShapeType.h (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeomShapes.cpp (99%) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeomTree.h (97%) rename src/ifcgeom/{ => kernels/opencascade}/IfcGeomWires.cpp (99%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegister.cpp (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegister.h (98%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegisterConvertCurve.h (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegisterConvertFace.h (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegisterConvertShape.h (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegisterConvertShapes.h (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegisterConvertWire.h (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegisterCreateCache.h (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegisterDef.h (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegisterGeomHeader.h (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegisterPurgeCache.h (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegisterShapeType.h (100%) rename src/ifcgeom/{ => kernels/opencascade}/IfcRegisterUndef.h (100%) rename src/ifcgeom/{ => kernels/opencascade}/OpenCascadeConversionResult.h (98%) rename src/ifcgeom/{ => kernels/opencascade}/OpenCascadeShape.cpp (98%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/ConversionResult.h (97%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/IfcGeomElement.h (98%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/IfcGeomFilter.h (99%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/IfcGeomIterator.h (99%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/IfcGeomIteratorSettings.h (98%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/IfcGeomMaterial.cpp (100%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/IfcGeomMaterial.h (97%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/IfcGeomRenderStyles.h (98%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/IfcGeomRepresentation.cpp (98%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/IfcGeomRepresentation.h (98%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/IteratorImplementation.cpp (100%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/IteratorImplementation.h (94%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/Kernel.cpp (99%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/Kernel.h (93%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/Serialization.cpp (100%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/Serialization.h (76%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/SurfaceStyle.cpp (98%) rename src/{ifcgeom_schema_agnostic => ifcgeom/schema_agnostic}/ifc_geom_api.h (100%) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 344f0ac5f1..8877c98919 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -554,42 +554,39 @@ ENDIF() if (BUILD_IFCGEOM) -### OCCT +foreach(schema 2x3 4) -# IfcGeom, schema dependent, OCCT -file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/*.h) -file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/*.cpp) +file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernel_agnostic/*.h) +file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/kernel_agnostic/*.cpp) set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES}) -foreach(schema 2x3 4) -add_library(IfcGeom_occt_ifc${schema} ${IFCGEOM_FILES}) -set_target_properties(IfcGeom_occt_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema} -DUSE_IFC${schema}") -TARGET_LINK_LIBRARIES(IfcGeom_occt_ifc${schema} IfcParse ${OPENCASCADE_LIBRARIES}) -list(APPEND IfcGeom_libraries IfcGeom_occt_ifc${schema}) -endforeach() +add_library(IfcGeom_ifc${schema} ${IFCGEOM_FILES}) +set_target_properties(IfcGeom_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema} -DUSE_IFC${schema}") +target_link_libraries(IfcGeom_ifc${schema} IfcParse) +list(APPEND IfcGeom_libraries IfcGeom_ifc${schema}) -### CGAL +foreach(kernel opencascade cgal) +string(TOUPPER ${kernel} KERNEL_UPPER) -# IfcGeom, schema dependent, CGAL -file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/cgal/*.h) -file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/kernels/cgal/*.cpp) +file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/${kernel}/*.h) +file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/kernels/${kernel}/*.cpp) set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES}) -foreach(schema 2x3 4) -add_library(IfcGeom_cgal_ifc${schema} ${IFCGEOM_FILES}) -set_target_properties(IfcGeom_cgal_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema} -DUSE_IFC${schema}") -TARGET_LINK_LIBRARIES(IfcGeom_cgal_ifc${schema} IfcParse ${OPENCASCADE_LIBRARIES}) -list(APPEND IfcGeom_libraries IfcGeom_cgal_ifc${schema}) +add_library(IfcGeom_${kernel}_ifc${schema} ${IFCGEOM_FILES}) +set_target_properties(IfcGeom_${kernel}_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema} -DUSE_IFC${schema}") +target_link_libraries(IfcGeom_${kernel}_ifc${schema} IfcGeom_ifc${schema} ${${KERNEL_UPPER}_LIBRARIES}) +list(APPEND IfcGeom_libraries IfcGeom_${kernel}_ifc${schema}) endforeach() -# IfcGeom, schema and kernel agnostic -file(GLOB SCHEMA_AGNOSTIC_H_FILES ../src/ifcgeom_schema_agnostic/*.h) -file(GLOB SCHEMA_AGNOSTIC_CPP_FILES ../src/ifcgeom_schema_agnostic/*.cpp) +endforeach() + +file(GLOB SCHEMA_AGNOSTIC_H_FILES ../src/ifcgeom/schema_agnostic/*.h) +file(GLOB SCHEMA_AGNOSTIC_CPP_FILES ../src/ifcgeom/schema_agnostic/*.cpp) set(SCHEMA_AGNOSTIC_FILES ${SCHEMA_AGNOSTIC_H_FILES} ${SCHEMA_AGNOSTIC_CPP_FILES}) add_library(IfcGeom ${SCHEMA_AGNOSTIC_FILES}) set_target_properties(IfcGeom PROPERTIES COMPILE_FLAGS -DIFC_GEOM_EXPORTS) -TARGET_LINK_LIBRARIES(IfcGeom ${IfcGeom_libraries}) +target_link_libraries(IfcGeom ${IfcGeom_libraries}) endif(BUILD_IFCGEOM) @@ -692,7 +689,7 @@ INSTALL(FILES ${IFCGEOM_H_FILES} ) INSTALL(FILES ${SCHEMA_AGNOSTIC_H_FILES} - DESTINATION ${INCLUDEDIR}/ifcgeom_schema_agnostic + DESTINATION ${INCLUDEDIR}/ifcgeom/schema_agnostic ) INSTALL(TARGETS IfcGeom ${IfcGeom_libraries} diff --git a/src/examples/IfcAdvancedHouse.cpp b/src/examples/IfcAdvancedHouse.cpp index 4372129fc9..3de0d52e34 100644 --- a/src/examples/IfcAdvancedHouse.cpp +++ b/src/examples/IfcAdvancedHouse.cpp @@ -49,7 +49,7 @@ #include "../ifcparse/IfcBaseClass.h" #include "../ifcparse/IfcHierarchyHelper.h" #include "../ifcgeom/IfcGeom.h" -#include "../ifcgeom_schema_agnostic/Serialization.h" +#include "../ifcgeom/schema_agnostic/Serialization.h" #if USE_VLD #include diff --git a/src/examples/IfcOpenHouse.cpp b/src/examples/IfcOpenHouse.cpp index e94042e9da..b3e0f7f10b 100644 --- a/src/examples/IfcOpenHouse.cpp +++ b/src/examples/IfcOpenHouse.cpp @@ -44,7 +44,7 @@ #include "../ifcparse/IfcBaseClass.h" #include "../ifcparse/IfcHierarchyHelper.h" #include "../ifcgeom/IfcGeom.h" -#include "../ifcgeom_schema_agnostic/Serialization.h" +#include "../ifcgeom/schema_agnostic/Serialization.h" #if USE_VLD #include diff --git a/src/ifcconvert/IfcConvert.cpp b/src/ifcconvert/IfcConvert.cpp index 2e7ac79e7a..5c1b7d5c58 100644 --- a/src/ifcconvert/IfcConvert.cpp +++ b/src/ifcconvert/IfcConvert.cpp @@ -33,9 +33,9 @@ #include "../serializers/XmlSerializer.h" #include "../serializers/SvgSerializer.h" -#include "../ifcgeom_schema_agnostic/IfcGeomFilter.h" -#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" -#include "../ifcgeom_schema_agnostic/IfcGeomRenderStyles.h" +#include "../ifcgeom/schema_agnostic/IfcGeomFilter.h" +#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h" +#include "../ifcgeom/schema_agnostic/IfcGeomRenderStyles.h" #include diff --git a/src/ifcgeom/kernels/cgal/CgalConversionResult.h b/src/ifcgeom/kernels/cgal/CgalConversionResult.h index 3b076b487f..4d78b23e2a 100644 --- a/src/ifcgeom/kernels/cgal/CgalConversionResult.h +++ b/src/ifcgeom/kernels/cgal/CgalConversionResult.h @@ -20,7 +20,7 @@ #ifndef CGALCONVERSIONRESULT_H #define CGALCONVERSIONRESULT_H -#include "../../../ifcgeom_schema_agnostic/ConversionResult.h" +#include "../../../ifcgeom/schema_agnostic/ConversionResult.h" namespace IfcGeom { diff --git a/src/ifcgeom/kernels/cgal/CgalEntityMapping.cpp b/src/ifcgeom/kernels/cgal/CgalEntityMapping.cpp index 6a11d8fa46..c92ac7c166 100644 --- a/src/ifcgeom/kernels/cgal/CgalEntityMapping.cpp +++ b/src/ifcgeom/kernels/cgal/CgalEntityMapping.cpp @@ -17,9 +17,6 @@ * * ********************************************************************************/ -#include "../../../ifcgeom/IfcGeomShapeType.h" -#include "../../../ifcgeom/IfcGeom.h" - #include "CgalKernel.h" #include "CgalConversionResult.h" diff --git a/src/ifcgeom/kernels/cgal/CgalKernel.cpp b/src/ifcgeom/kernels/cgal/CgalKernel.cpp index 42e2a36010..4c67c670ba 100644 --- a/src/ifcgeom/kernels/cgal/CgalKernel.cpp +++ b/src/ifcgeom/kernels/cgal/CgalKernel.cpp @@ -17,16 +17,13 @@ * * ********************************************************************************/ -#include "../../../ifcgeom/IfcGeomShapeType.h" -#include "../../../ifcgeom/IfcGeom.h" - #include "CgalKernel.h" #include "CgalConversionResult.h" namespace { struct MAKE_TYPE_NAME(factory_t) { IfcGeom::Kernel* operator()(IfcParse::IfcFile* file) const { - IfcGeom::MAKE_TYPE_NAME(Kernel)* k = new IfcGeom::MAKE_TYPE_NAME(Kernel); + IfcGeom::MAKE_TYPE_NAME(CgalKernel)* k = new IfcGeom::MAKE_TYPE_NAME(CgalKernel); return k; } }; @@ -84,7 +81,8 @@ bool IfcGeom::CgalKernel::is_identity_transform(IfcUtil::IfcBaseClass* l) { */ } -IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_representation_and_product( +template +IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_representation_and_product( const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product) { IfcGeom::Representation::BRep* shape; @@ -139,7 +137,7 @@ IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_representat context_string = representation->ContextOfItems()->ContextType(); } - return new NativeElement( + return new NativeElement( product->data().id(), parent_id, name, @@ -152,9 +150,10 @@ IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_representat ); } -IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_processed_representation( +template +IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_processed_representation( const IteratorSettings& /*settings*/, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product, - IfcGeom::NativeElement* brep) + IfcGeom::NativeElement* brep) { int parent_id = -1; try { @@ -183,7 +182,7 @@ IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_processed_r const std::string product_type = product->declaration().name(); - return new NativeElement( + return new NativeElement( product->data().id(), parent_id, name, @@ -195,3 +194,17 @@ IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_processed_r product ); } + +template IFC_GEOM_API IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_representation_and_product( + const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product); +template IFC_GEOM_API IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_representation_and_product( + const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product); +template IFC_GEOM_API IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_representation_and_product( + const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product); + +template IFC_GEOM_API IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_processed_representation( + const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product, IfcGeom::NativeElement* brep); +template IFC_GEOM_API IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_processed_representation( + const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product, IfcGeom::NativeElement* brep); +template IFC_GEOM_API IfcGeom::NativeElement* IfcGeom::CgalKernel::create_brep_for_processed_representation( + const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product, IfcGeom::NativeElement* brep); diff --git a/src/ifcgeom/kernels/cgal/CgalKernel.h b/src/ifcgeom/kernels/cgal/CgalKernel.h index 8eef64f8da..5d9cfd21fe 100644 --- a/src/ifcgeom/kernels/cgal/CgalKernel.h +++ b/src/ifcgeom/kernels/cgal/CgalKernel.h @@ -35,7 +35,16 @@ if ( it != cache.T.end() ) { e = it->second; return true; } #endif */ -#include "../../../ifcgeom/IfcGeom.h" +#include "../../../ifcparse/macros.h" +#include "../../../ifcgeom/schema_agnostic/Kernel.h" +#include "../../../ifcgeom/schema_agnostic/IfcGeomElement.h" + +// @todo create separate shapetype enum? +#include "../../../ifcgeom/kernels/opencascade/IfcGeomShapeType.h" + +#define INCLUDE_SCHEMA(x) STRINGIFY(../../../ifcparse/x.h) +#include INCLUDE_SCHEMA(IfcSchema) +#undef INCLUDE_SCHEMA typedef void* cgal_shape_t; typedef void* cgal_face_t; @@ -55,6 +64,8 @@ namespace IfcGeom { class IFC_GEOM_API MAKE_TYPE_NAME(CgalKernel) : public Kernel { public: + MAKE_TYPE_NAME(CgalKernel)() : Kernel("cgal") {} + #ifndef NO_CACHE CgalCache cache; #endif @@ -79,10 +90,15 @@ namespace IfcGeom { } virtual bool is_identity_transform(IfcUtil::IfcBaseClass*); - virtual IfcGeom::NativeElement* create_brep_for_representation_and_product( + + template + IfcGeom::NativeElement* create_brep_for_representation_and_product( const IteratorSettings&, IfcSchema::IfcRepresentation*, IfcSchema::IfcProduct*); - virtual IfcGeom::NativeElement* create_brep_for_processed_representation( - const IteratorSettings&, IfcSchema::IfcRepresentation*, IfcSchema::IfcProduct*, IfcGeom::NativeElement*); + + template + IfcGeom::NativeElement* create_brep_for_processed_representation( + const IteratorSettings&, IfcSchema::IfcRepresentation*, IfcSchema::IfcProduct*, IfcGeom::NativeElement*); + #include "CgalEntityMappingDeclaration.h" diff --git a/src/ifcgeom/IfcGeom.h b/src/ifcgeom/kernels/opencascade/IfcGeom.h similarity index 96% rename from src/ifcgeom/IfcGeom.h rename to src/ifcgeom/kernels/opencascade/IfcGeom.h index ab564c11f2..0663450788 100644 --- a/src/ifcgeom/IfcGeom.h +++ b/src/ifcgeom/kernels/opencascade/IfcGeom.h @@ -48,19 +48,19 @@ inline static bool ALMOST_THE_SAME(const T& a, const T& b, double tolerance=ALMO #include #include -#include "../ifcparse/macros.h" -#include "../ifcparse/IfcParse.h" -#include "../ifcparse/IfcBaseClass.h" +#include "../../../ifcparse/macros.h" +#include "../../../ifcparse/IfcParse.h" +#include "../../../ifcparse/IfcBaseClass.h" -#include "../ifcgeom_schema_agnostic/IfcGeomElement.h" -#include "../ifcgeom_schema_agnostic/IfcGeomRepresentation.h" -#include "../ifcgeom_schema_agnostic/ConversionResult.h" -#include "../ifcgeom/IfcGeomShapeType.h" +#include "../../../ifcgeom/schema_agnostic/IfcGeomElement.h" +#include "../../../ifcgeom/schema_agnostic/IfcGeomRepresentation.h" +#include "../../../ifcgeom/schema_agnostic/ConversionResult.h" +#include "../../../ifcgeom/kernels/opencascade/IfcGeomShapeType.h" -#include "../ifcgeom_schema_agnostic/Kernel.h" +#include "../../../ifcgeom/schema_agnostic/Kernel.h" #include "OpenCascadeConversionResult.h" -#include "../ifcgeom_schema_agnostic/ifc_geom_api.h" +#include "../../../ifcgeom/schema_agnostic/ifc_geom_api.h" // Define this in case you want to conserve memory usage at all cost. This has been // benchmarked extensively: https://github.com/IfcOpenShell/IfcOpenShell/pull/47 @@ -79,8 +79,9 @@ if ( it != cache.T.end() ) { e = it->second; return true; } #endif -#define INCLUDE_PARENT_DIR(x) STRINGIFY(../ifcparse/x.h) -#include INCLUDE_PARENT_DIR(IfcSchema) +#define INCLUDE_SCHEMA(x) STRINGIFY(../../../ifcparse/x.h) +#include INCLUDE_SCHEMA(IfcSchema) +#undef INCLUDE_SCHEMA namespace IfcGeom { class IFC_GEOM_API geometry_exception : public std::exception { @@ -228,7 +229,7 @@ private: public: MAKE_TYPE_NAME(Kernel)() - : IfcGeom::Kernel(0) + : IfcGeom::Kernel("opencascade", 0) , deflection_tolerance(0.001) , wire_creation_tolerance(0.0001) , point_equality_tolerance(0.00001) diff --git a/src/ifcgeom/IfcGeomCurves.cpp b/src/ifcgeom/kernels/opencascade/IfcGeomCurves.cpp similarity index 99% rename from src/ifcgeom/IfcGeomCurves.cpp rename to src/ifcgeom/kernels/opencascade/IfcGeomCurves.cpp index d2acb0523b..a2dc30343a 100644 --- a/src/ifcgeom/IfcGeomCurves.cpp +++ b/src/ifcgeom/kernels/opencascade/IfcGeomCurves.cpp @@ -81,7 +81,7 @@ #include #endif -#include "../ifcgeom/IfcGeom.h" +#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h" #define Kernel MAKE_TYPE_NAME(Kernel) diff --git a/src/ifcgeom/IfcGeomFaces.cpp b/src/ifcgeom/kernels/opencascade/IfcGeomFaces.cpp similarity index 99% rename from src/ifcgeom/IfcGeomFaces.cpp rename to src/ifcgeom/kernels/opencascade/IfcGeomFaces.cpp index 6ba4746f42..6e2943d3c6 100644 --- a/src/ifcgeom/IfcGeomFaces.cpp +++ b/src/ifcgeom/kernels/opencascade/IfcGeomFaces.cpp @@ -102,7 +102,7 @@ #include #endif -#include "../ifcgeom/IfcGeom.h" +#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h" #define Kernel MAKE_TYPE_NAME(Kernel) diff --git a/src/ifcgeom/IfcGeomFunctions.cpp b/src/ifcgeom/kernels/opencascade/IfcGeomFunctions.cpp similarity index 99% rename from src/ifcgeom/IfcGeomFunctions.cpp rename to src/ifcgeom/kernels/opencascade/IfcGeomFunctions.cpp index efe0339cbe..5bc687e718 100644 --- a/src/ifcgeom/IfcGeomFunctions.cpp +++ b/src/ifcgeom/kernels/opencascade/IfcGeomFunctions.cpp @@ -146,11 +146,11 @@ #include #include -#include "../ifcparse/macros.h" -#include "../ifcparse/IfcSIPrefix.h" -#include "../ifcparse/IfcFile.h" -#include "../ifcgeom/IfcGeom.h" -#include "../ifcgeom/IfcGeomTree.h" +#include "../../../ifcparse/macros.h" +#include "../../../ifcparse/IfcSIPrefix.h" +#include "../../../ifcparse/IfcFile.h" +#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h" +#include "../../../ifcgeom/kernels/opencascade/IfcGeomTree.h" #include diff --git a/src/ifcgeom/IfcGeomHelpers.cpp b/src/ifcgeom/kernels/opencascade/IfcGeomHelpers.cpp similarity index 99% rename from src/ifcgeom/IfcGeomHelpers.cpp rename to src/ifcgeom/kernels/opencascade/IfcGeomHelpers.cpp index 0b6df4d931..99db68c5ab 100644 --- a/src/ifcgeom/IfcGeomHelpers.cpp +++ b/src/ifcgeom/kernels/opencascade/IfcGeomHelpers.cpp @@ -75,7 +75,7 @@ #include -#include "../ifcgeom/IfcGeom.h" +#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h" #define Kernel MAKE_TYPE_NAME(Kernel) diff --git a/src/ifcgeom/IfcGeomIteratorImplementation.cpp b/src/ifcgeom/kernels/opencascade/IfcGeomIteratorImplementation.cpp similarity index 95% rename from src/ifcgeom/IfcGeomIteratorImplementation.cpp rename to src/ifcgeom/kernels/opencascade/IfcGeomIteratorImplementation.cpp index d693dbfa68..82fc1cc17b 100644 --- a/src/ifcgeom/IfcGeomIteratorImplementation.cpp +++ b/src/ifcgeom/kernels/opencascade/IfcGeomIteratorImplementation.cpp @@ -1,5 +1,5 @@ #include "IfcGeomIteratorImplementation.h" -#include "../ifcgeom_schema_agnostic/IteratorImplementation.h" +#include "../../../ifcgeom/schema_agnostic/IteratorImplementation.h" namespace IfcGeom { template class MAKE_TYPE_NAME(IteratorImplementation_); diff --git a/src/ifcgeom/IfcGeomIteratorImplementation.h b/src/ifcgeom/kernels/opencascade/IfcGeomIteratorImplementation.h similarity index 98% rename from src/ifcgeom/IfcGeomIteratorImplementation.h rename to src/ifcgeom/kernels/opencascade/IfcGeomIteratorImplementation.h index b430a79edd..1741c84e2f 100644 --- a/src/ifcgeom/IfcGeomIteratorImplementation.h +++ b/src/ifcgeom/kernels/opencascade/IfcGeomIteratorImplementation.h @@ -73,16 +73,16 @@ #include #include -#include "../ifcparse/IfcFile.h" +#include "../../../ifcparse/IfcFile.h" -#include "../ifcgeom/IfcGeom.h" -#include "../ifcgeom_schema_agnostic/IfcGeomElement.h" -#include "../ifcgeom_schema_agnostic/IfcGeomMaterial.h" -#include "../ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h" -#include "../ifcgeom_schema_agnostic/ConversionResult.h" +#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h" +#include "../../../ifcgeom/schema_agnostic/IfcGeomElement.h" +#include "../../../ifcgeom/schema_agnostic/IfcGeomMaterial.h" +#include "../../../ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h" +#include "../../../ifcgeom/schema_agnostic/ConversionResult.h" -#include "../ifcgeom_schema_agnostic/IfcGeomFilter.h" -#include "../ifcgeom_schema_agnostic/IteratorImplementation.h" +#include "../../../ifcgeom/schema_agnostic/IfcGeomFilter.h" +#include "../../../ifcgeom/schema_agnostic/IteratorImplementation.h" // The infamous min & max Win32 #defines can leak here from OCE depending on the build configuration #ifdef min diff --git a/src/ifcgeom/IfcGeomRenderStyles.cpp b/src/ifcgeom/kernels/opencascade/IfcGeomRenderStyles.cpp similarity index 100% rename from src/ifcgeom/IfcGeomRenderStyles.cpp rename to src/ifcgeom/kernels/opencascade/IfcGeomRenderStyles.cpp diff --git a/src/ifcgeom/IfcGeomSerialisation.cpp b/src/ifcgeom/kernels/opencascade/IfcGeomSerialisation.cpp similarity index 100% rename from src/ifcgeom/IfcGeomSerialisation.cpp rename to src/ifcgeom/kernels/opencascade/IfcGeomSerialisation.cpp diff --git a/src/ifcgeom/IfcGeomShapeType.h b/src/ifcgeom/kernels/opencascade/IfcGeomShapeType.h similarity index 100% rename from src/ifcgeom/IfcGeomShapeType.h rename to src/ifcgeom/kernels/opencascade/IfcGeomShapeType.h diff --git a/src/ifcgeom/IfcGeomShapes.cpp b/src/ifcgeom/kernels/opencascade/IfcGeomShapes.cpp similarity index 99% rename from src/ifcgeom/IfcGeomShapes.cpp rename to src/ifcgeom/kernels/opencascade/IfcGeomShapes.cpp index 1ace031e56..7b10f3579b 100644 --- a/src/ifcgeom/IfcGeomShapes.cpp +++ b/src/ifcgeom/kernels/opencascade/IfcGeomShapes.cpp @@ -101,7 +101,7 @@ #include -#include "../ifcgeom/IfcGeom.h" +#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h" #include diff --git a/src/ifcgeom/IfcGeomTree.h b/src/ifcgeom/kernels/opencascade/IfcGeomTree.h similarity index 97% rename from src/ifcgeom/IfcGeomTree.h rename to src/ifcgeom/kernels/opencascade/IfcGeomTree.h index e369acc5d3..a1f5ff83e2 100644 --- a/src/ifcgeom/IfcGeomTree.h +++ b/src/ifcgeom/kernels/opencascade/IfcGeomTree.h @@ -20,10 +20,10 @@ #ifndef IFCGEOMTREE_H #define IFCGEOMTREE_H -#include "../ifcparse/IfcFile.h" -#include "../ifcgeom_schema_agnostic/IfcGeomElement.h" -#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" -#include "../ifcgeom_schema_agnostic/Kernel.h" +#include "../../../ifcparse/IfcFile.h" +#include "../../../ifcgeom/schema_agnostic/IfcGeomElement.h" +#include "../../../ifcgeom/schema_agnostic/IfcGeomIterator.h" +#include "../../../ifcgeom/schema_agnostic/Kernel.h" #include #include diff --git a/src/ifcgeom/IfcGeomWires.cpp b/src/ifcgeom/kernels/opencascade/IfcGeomWires.cpp similarity index 99% rename from src/ifcgeom/IfcGeomWires.cpp rename to src/ifcgeom/kernels/opencascade/IfcGeomWires.cpp index 347b9dc87e..8ccff67a3d 100644 --- a/src/ifcgeom/IfcGeomWires.cpp +++ b/src/ifcgeom/kernels/opencascade/IfcGeomWires.cpp @@ -95,7 +95,7 @@ #include #include -#include "../ifcgeom/IfcGeom.h" +#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h" #define Kernel MAKE_TYPE_NAME(Kernel) diff --git a/src/ifcgeom/IfcRegister.cpp b/src/ifcgeom/kernels/opencascade/IfcRegister.cpp similarity index 100% rename from src/ifcgeom/IfcRegister.cpp rename to src/ifcgeom/kernels/opencascade/IfcRegister.cpp diff --git a/src/ifcgeom/IfcRegister.h b/src/ifcgeom/kernels/opencascade/IfcRegister.h similarity index 98% rename from src/ifcgeom/IfcRegister.h rename to src/ifcgeom/kernels/opencascade/IfcRegister.h index 36bed45ee0..380be6d695 100644 --- a/src/ifcgeom/IfcRegister.h +++ b/src/ifcgeom/kernels/opencascade/IfcRegister.h @@ -38,8 +38,8 @@ #include #include -#include "../ifcparse/IfcBaseClass.h" -#include "../ifcparse/IfcParse.h" +#include "../../../ifcparse/IfcBaseClass.h" +#include "../../../ifcparse/IfcParse.h" SHAPES(IfcShellBasedSurfaceModel); SHAPES(IfcFaceBasedSurfaceModel); diff --git a/src/ifcgeom/IfcRegisterConvertCurve.h b/src/ifcgeom/kernels/opencascade/IfcRegisterConvertCurve.h similarity index 100% rename from src/ifcgeom/IfcRegisterConvertCurve.h rename to src/ifcgeom/kernels/opencascade/IfcRegisterConvertCurve.h diff --git a/src/ifcgeom/IfcRegisterConvertFace.h b/src/ifcgeom/kernels/opencascade/IfcRegisterConvertFace.h similarity index 100% rename from src/ifcgeom/IfcRegisterConvertFace.h rename to src/ifcgeom/kernels/opencascade/IfcRegisterConvertFace.h diff --git a/src/ifcgeom/IfcRegisterConvertShape.h b/src/ifcgeom/kernels/opencascade/IfcRegisterConvertShape.h similarity index 100% rename from src/ifcgeom/IfcRegisterConvertShape.h rename to src/ifcgeom/kernels/opencascade/IfcRegisterConvertShape.h diff --git a/src/ifcgeom/IfcRegisterConvertShapes.h b/src/ifcgeom/kernels/opencascade/IfcRegisterConvertShapes.h similarity index 100% rename from src/ifcgeom/IfcRegisterConvertShapes.h rename to src/ifcgeom/kernels/opencascade/IfcRegisterConvertShapes.h diff --git a/src/ifcgeom/IfcRegisterConvertWire.h b/src/ifcgeom/kernels/opencascade/IfcRegisterConvertWire.h similarity index 100% rename from src/ifcgeom/IfcRegisterConvertWire.h rename to src/ifcgeom/kernels/opencascade/IfcRegisterConvertWire.h diff --git a/src/ifcgeom/IfcRegisterCreateCache.h b/src/ifcgeom/kernels/opencascade/IfcRegisterCreateCache.h similarity index 100% rename from src/ifcgeom/IfcRegisterCreateCache.h rename to src/ifcgeom/kernels/opencascade/IfcRegisterCreateCache.h diff --git a/src/ifcgeom/IfcRegisterDef.h b/src/ifcgeom/kernels/opencascade/IfcRegisterDef.h similarity index 100% rename from src/ifcgeom/IfcRegisterDef.h rename to src/ifcgeom/kernels/opencascade/IfcRegisterDef.h diff --git a/src/ifcgeom/IfcRegisterGeomHeader.h b/src/ifcgeom/kernels/opencascade/IfcRegisterGeomHeader.h similarity index 100% rename from src/ifcgeom/IfcRegisterGeomHeader.h rename to src/ifcgeom/kernels/opencascade/IfcRegisterGeomHeader.h diff --git a/src/ifcgeom/IfcRegisterPurgeCache.h b/src/ifcgeom/kernels/opencascade/IfcRegisterPurgeCache.h similarity index 100% rename from src/ifcgeom/IfcRegisterPurgeCache.h rename to src/ifcgeom/kernels/opencascade/IfcRegisterPurgeCache.h diff --git a/src/ifcgeom/IfcRegisterShapeType.h b/src/ifcgeom/kernels/opencascade/IfcRegisterShapeType.h similarity index 100% rename from src/ifcgeom/IfcRegisterShapeType.h rename to src/ifcgeom/kernels/opencascade/IfcRegisterShapeType.h diff --git a/src/ifcgeom/IfcRegisterUndef.h b/src/ifcgeom/kernels/opencascade/IfcRegisterUndef.h similarity index 100% rename from src/ifcgeom/IfcRegisterUndef.h rename to src/ifcgeom/kernels/opencascade/IfcRegisterUndef.h diff --git a/src/ifcgeom/OpenCascadeConversionResult.h b/src/ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h similarity index 98% rename from src/ifcgeom/OpenCascadeConversionResult.h rename to src/ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h index 8254510245..621f030960 100644 --- a/src/ifcgeom/OpenCascadeConversionResult.h +++ b/src/ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h @@ -34,7 +34,7 @@ #include #include -#include "../ifcgeom_schema_agnostic/ConversionResult.h" +#include "../../../ifcgeom/schema_agnostic/ConversionResult.h" namespace IfcGeom { diff --git a/src/ifcgeom/OpenCascadeShape.cpp b/src/ifcgeom/kernels/opencascade/OpenCascadeShape.cpp similarity index 98% rename from src/ifcgeom/OpenCascadeShape.cpp rename to src/ifcgeom/kernels/opencascade/OpenCascadeShape.cpp index bf9e705674..a48515d07b 100644 --- a/src/ifcgeom/OpenCascadeShape.cpp +++ b/src/ifcgeom/kernels/opencascade/OpenCascadeShape.cpp @@ -1,7 +1,7 @@ #include "OpenCascadeConversionResult.h" -#include "../ifcparse/IfcLogger.h" -#include "../ifcgeom_schema_agnostic/IfcGeomRepresentation.h" +#include "../../../ifcparse/IfcLogger.h" +#include "../../../ifcgeom/schema_agnostic/IfcGeomRepresentation.h" #include "IfcGeom.h" diff --git a/src/ifcgeom_schema_agnostic/ConversionResult.h b/src/ifcgeom/schema_agnostic/ConversionResult.h similarity index 97% rename from src/ifcgeom_schema_agnostic/ConversionResult.h rename to src/ifcgeom/schema_agnostic/ConversionResult.h index 2f2b9d9796..e4f5b55211 100644 --- a/src/ifcgeom_schema_agnostic/ConversionResult.h +++ b/src/ifcgeom/schema_agnostic/ConversionResult.h @@ -20,8 +20,8 @@ #ifndef IFCSHAPELIST_H #define IFCSHAPELIST_H -#include "../ifcgeom_schema_agnostic/IfcGeomRenderStyles.h" -#include "../ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h" +#include "../../ifcgeom/schema_agnostic/IfcGeomRenderStyles.h" +#include "../../ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h" namespace IfcGeom { diff --git a/src/ifcgeom_schema_agnostic/IfcGeomElement.h b/src/ifcgeom/schema_agnostic/IfcGeomElement.h similarity index 98% rename from src/ifcgeom_schema_agnostic/IfcGeomElement.h rename to src/ifcgeom/schema_agnostic/IfcGeomElement.h index fa6e00a107..b8ac73eff4 100644 --- a/src/ifcgeom_schema_agnostic/IfcGeomElement.h +++ b/src/ifcgeom/schema_agnostic/IfcGeomElement.h @@ -23,10 +23,11 @@ #include #include -#include "../ifcparse/IfcGlobalId.h" +#include "../../ifcparse/IfcGlobalId.h" + +#include "../../ifcgeom/schema_agnostic/IfcGeomRepresentation.h" +#include "../../ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h" -#include "../ifcgeom_schema_agnostic/IfcGeomRepresentation.h" -#include "../ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h" #include "ifc_geom_api.h" namespace IfcGeom { diff --git a/src/ifcgeom_schema_agnostic/IfcGeomFilter.h b/src/ifcgeom/schema_agnostic/IfcGeomFilter.h similarity index 99% rename from src/ifcgeom_schema_agnostic/IfcGeomFilter.h rename to src/ifcgeom/schema_agnostic/IfcGeomFilter.h index bc86cc295b..6e9a68d340 100644 --- a/src/ifcgeom_schema_agnostic/IfcGeomFilter.h +++ b/src/ifcgeom/schema_agnostic/IfcGeomFilter.h @@ -23,8 +23,8 @@ #ifndef IFCGEOMFILTER_H #define IFCGEOMFILTER_H -#include "Kernel.h" -#include "../ifcparse/IfcFile.h" +#include "../../ifcgeom/schema_agnostic/Kernel.h" +#include "../../ifcparse/IfcFile.h" #include #include diff --git a/src/ifcgeom_schema_agnostic/IfcGeomIterator.h b/src/ifcgeom/schema_agnostic/IfcGeomIterator.h similarity index 99% rename from src/ifcgeom_schema_agnostic/IfcGeomIterator.h rename to src/ifcgeom/schema_agnostic/IfcGeomIterator.h index babff4709f..d011ad6657 100644 --- a/src/ifcgeom_schema_agnostic/IfcGeomIterator.h +++ b/src/ifcgeom/schema_agnostic/IfcGeomIterator.h @@ -58,7 +58,7 @@ #ifndef IFCGEOMITERATOR_H #define IFCGEOMITERATOR_H -#include "../ifcgeom_schema_agnostic/IteratorImplementation.h" +#include "../../ifcgeom/schema_agnostic/IteratorImplementation.h" // The infamous min & max Win32 #defines can leak here from OCE depending on the build configuration #ifdef min diff --git a/src/ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h b/src/ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h similarity index 98% rename from src/ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h rename to src/ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h index 662d475e1e..1ad0850423 100644 --- a/src/ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h +++ b/src/ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h @@ -21,9 +21,9 @@ #define IFCGEOMITERATORSETTINGS_H #include "ifc_geom_api.h" -#include "../ifcparse/IfcException.h" -#include "../ifcparse/IfcBaseClass.h" -#include "../ifcparse/IfcLogger.h" +#include "../../ifcparse/IfcException.h" +#include "../../ifcparse/IfcBaseClass.h" +#include "../../ifcparse/IfcLogger.h" namespace IfcGeom { diff --git a/src/ifcgeom_schema_agnostic/IfcGeomMaterial.cpp b/src/ifcgeom/schema_agnostic/IfcGeomMaterial.cpp similarity index 100% rename from src/ifcgeom_schema_agnostic/IfcGeomMaterial.cpp rename to src/ifcgeom/schema_agnostic/IfcGeomMaterial.cpp diff --git a/src/ifcgeom_schema_agnostic/IfcGeomMaterial.h b/src/ifcgeom/schema_agnostic/IfcGeomMaterial.h similarity index 97% rename from src/ifcgeom_schema_agnostic/IfcGeomMaterial.h rename to src/ifcgeom/schema_agnostic/IfcGeomMaterial.h index 8614ae20d3..c700aa7760 100644 --- a/src/ifcgeom_schema_agnostic/IfcGeomMaterial.h +++ b/src/ifcgeom/schema_agnostic/IfcGeomMaterial.h @@ -22,7 +22,7 @@ #include -#include "../ifcgeom_schema_agnostic/IfcGeomRenderStyles.h" +#include "../../ifcgeom/schema_agnostic/IfcGeomRenderStyles.h" namespace IfcGeom { diff --git a/src/ifcgeom_schema_agnostic/IfcGeomRenderStyles.h b/src/ifcgeom/schema_agnostic/IfcGeomRenderStyles.h similarity index 98% rename from src/ifcgeom_schema_agnostic/IfcGeomRenderStyles.h rename to src/ifcgeom/schema_agnostic/IfcGeomRenderStyles.h index ec0b5ed265..5c98a70469 100644 --- a/src/ifcgeom_schema_agnostic/IfcGeomRenderStyles.h +++ b/src/ifcgeom/schema_agnostic/IfcGeomRenderStyles.h @@ -20,7 +20,7 @@ #ifndef IFCGEOMRENDERSTYLES_H #define IFCGEOMRENDERSTYLES_H -#include "../ifcgeom_schema_agnostic/ifc_geom_api.h" +#include "../../ifcgeom/schema_agnostic/ifc_geom_api.h" #include #include diff --git a/src/ifcgeom_schema_agnostic/IfcGeomRepresentation.cpp b/src/ifcgeom/schema_agnostic/IfcGeomRepresentation.cpp similarity index 98% rename from src/ifcgeom_schema_agnostic/IfcGeomRepresentation.cpp rename to src/ifcgeom/schema_agnostic/IfcGeomRepresentation.cpp index 011fd96a4d..5a273eb95e 100644 --- a/src/ifcgeom_schema_agnostic/IfcGeomRepresentation.cpp +++ b/src/ifcgeom/schema_agnostic/IfcGeomRepresentation.cpp @@ -27,8 +27,8 @@ #include #include "IfcGeomRepresentation.h" -#include "../ifcgeom/OpenCascadeConversionResult.h" -#include "../ifcgeom_schema_agnostic/Kernel.h" +#include "../../ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h" +#include "../../ifcgeom/schema_agnostic/Kernel.h" IfcGeom::Representation::Serialization::Serialization(const BRep& brep) : Representation(brep.settings()) diff --git a/src/ifcgeom_schema_agnostic/IfcGeomRepresentation.h b/src/ifcgeom/schema_agnostic/IfcGeomRepresentation.h similarity index 98% rename from src/ifcgeom_schema_agnostic/IfcGeomRepresentation.h rename to src/ifcgeom/schema_agnostic/IfcGeomRepresentation.h index f67b130b43..f6232007ce 100644 --- a/src/ifcgeom_schema_agnostic/IfcGeomRepresentation.h +++ b/src/ifcgeom/schema_agnostic/IfcGeomRepresentation.h @@ -35,9 +35,9 @@ #include #include -#include "../ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h" -#include "../ifcgeom_schema_agnostic/IfcGeomMaterial.h" -#include "../ifcgeom_schema_agnostic/ConversionResult.h" +#include "../../ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h" +#include "../../ifcgeom/schema_agnostic/IfcGeomMaterial.h" +#include "../../ifcgeom/schema_agnostic/ConversionResult.h" #include diff --git a/src/ifcgeom_schema_agnostic/IteratorImplementation.cpp b/src/ifcgeom/schema_agnostic/IteratorImplementation.cpp similarity index 100% rename from src/ifcgeom_schema_agnostic/IteratorImplementation.cpp rename to src/ifcgeom/schema_agnostic/IteratorImplementation.cpp diff --git a/src/ifcgeom_schema_agnostic/IteratorImplementation.h b/src/ifcgeom/schema_agnostic/IteratorImplementation.h similarity index 94% rename from src/ifcgeom_schema_agnostic/IteratorImplementation.h rename to src/ifcgeom/schema_agnostic/IteratorImplementation.h index 5417584c20..46dc8adccd 100644 --- a/src/ifcgeom_schema_agnostic/IteratorImplementation.h +++ b/src/ifcgeom/schema_agnostic/IteratorImplementation.h @@ -1,9 +1,9 @@ #ifndef ITERATOR_IMPLEMENTATION_H #define ITERATOR_IMPLEMENTATION_H -#include "../ifcgeom_schema_agnostic/IfcGeomFilter.h" -#include "../ifcparse/IfcFile.h" -#include "../ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h" +#include "../../ifcparse/IfcFile.h" +#include "../../ifcgeom/schema_agnostic/IfcGeomFilter.h" +#include "../../ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h" #include diff --git a/src/ifcgeom_schema_agnostic/Kernel.cpp b/src/ifcgeom/schema_agnostic/Kernel.cpp similarity index 99% rename from src/ifcgeom_schema_agnostic/Kernel.cpp rename to src/ifcgeom/schema_agnostic/Kernel.cpp index ecc9562e97..de6bf568a8 100644 --- a/src/ifcgeom_schema_agnostic/Kernel.cpp +++ b/src/ifcgeom/schema_agnostic/Kernel.cpp @@ -1,5 +1,8 @@ #include "Kernel.h" +#include "../../ifcparse/Ifc2x3.h" +#include "../../ifcparse/Ifc4.h" + #include #include #include diff --git a/src/ifcgeom_schema_agnostic/Kernel.h b/src/ifcgeom/schema_agnostic/Kernel.h similarity index 93% rename from src/ifcgeom_schema_agnostic/Kernel.h rename to src/ifcgeom/schema_agnostic/Kernel.h index 75c93d2c39..549e6be0c8 100644 --- a/src/ifcgeom_schema_agnostic/Kernel.h +++ b/src/ifcgeom/schema_agnostic/Kernel.h @@ -1,12 +1,9 @@ #ifndef ITERATOR_KERNEL_H #define ITERATOR_KERNEL_H -#include "../ifcparse/IfcFile.h" -#include "../ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h" -#include "../ifcgeom_schema_agnostic/ConversionResult.h" - -#include "../ifcparse/Ifc2x3.h" -#include "../ifcparse/Ifc4.h" +#include "../../ifcparse/IfcFile.h" +#include "../../ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h" +#include "../../ifcgeom/schema_agnostic/ConversionResult.h" #include diff --git a/src/ifcgeom_schema_agnostic/Serialization.cpp b/src/ifcgeom/schema_agnostic/Serialization.cpp similarity index 100% rename from src/ifcgeom_schema_agnostic/Serialization.cpp rename to src/ifcgeom/schema_agnostic/Serialization.cpp diff --git a/src/ifcgeom_schema_agnostic/Serialization.h b/src/ifcgeom/schema_agnostic/Serialization.h similarity index 76% rename from src/ifcgeom_schema_agnostic/Serialization.h rename to src/ifcgeom/schema_agnostic/Serialization.h index e7adf5f057..8feda56f8e 100644 --- a/src/ifcgeom_schema_agnostic/Serialization.h +++ b/src/ifcgeom/schema_agnostic/Serialization.h @@ -1,5 +1,6 @@ -#include "../ifcgeom_schema_agnostic/ifc_geom_api.h" -#include "../ifcparse/IfcBaseClass.h" +#include "../../ifcparse/IfcBaseClass.h" + +#include "../../ifcgeom/schema_agnostic/ifc_geom_api.h" #include diff --git a/src/ifcgeom_schema_agnostic/SurfaceStyle.cpp b/src/ifcgeom/schema_agnostic/SurfaceStyle.cpp similarity index 98% rename from src/ifcgeom_schema_agnostic/SurfaceStyle.cpp rename to src/ifcgeom/schema_agnostic/SurfaceStyle.cpp index c3db9c3756..09d1344654 100644 --- a/src/ifcgeom_schema_agnostic/SurfaceStyle.cpp +++ b/src/ifcgeom/schema_agnostic/SurfaceStyle.cpp @@ -1,4 +1,4 @@ -#include "../ifcgeom_schema_agnostic/IfcGeomRenderStyles.h" +#include "../../ifcgeom/schema_agnostic/IfcGeomRenderStyles.h" #include #include diff --git a/src/ifcgeom_schema_agnostic/ifc_geom_api.h b/src/ifcgeom/schema_agnostic/ifc_geom_api.h similarity index 100% rename from src/ifcgeom_schema_agnostic/ifc_geom_api.h rename to src/ifcgeom/schema_agnostic/ifc_geom_api.h diff --git a/src/ifcgeomserver/IfcGeomServer.cpp b/src/ifcgeomserver/IfcGeomServer.cpp index 7a2cc9ee90..6d9265bcd3 100644 --- a/src/ifcgeomserver/IfcGeomServer.cpp +++ b/src/ifcgeomserver/IfcGeomServer.cpp @@ -38,8 +38,8 @@ #include #endif -#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" -#include "../ifcgeom_schema_agnostic/IfcGeomElement.h" +#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h" +#include "../ifcgeom/schema_agnostic/IfcGeomElement.h" #include "../ifcparse/IfcFile.h" #include "../ifcparse/IfcLogger.h" diff --git a/src/ifcparse/IfcParse.h b/src/ifcparse/IfcParse.h index 384e7c4465..2970a4db5c 100644 --- a/src/ifcparse/IfcParse.h +++ b/src/ifcparse/IfcParse.h @@ -27,7 +27,7 @@ #ifndef IFCPARSE_H #define IFCPARSE_H -#define IFCOPENSHELL_VERSION "0.6.0a1" +#define IFCOPENSHELL_VERSION "0.7.0-dev" #include #include diff --git a/src/ifcwrap/IfcPython.i b/src/ifcwrap/IfcPython.i index 2bdf89637c..7b54ac2e94 100644 --- a/src/ifcwrap/IfcPython.i +++ b/src/ifcwrap/IfcPython.i @@ -70,8 +70,8 @@ } %module ifcopenshell_wrapper %{ - #include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" - #include "../ifcgeom_schema_agnostic/Serialization.h" + #include "../ifcgeom/schema_agnostic/IfcGeomIterator.h" + #include "../ifcgeom/schema_agnostic/Serialization.h" #include "../ifcgeom/IfcGeomTree.h" #include "../ifcparse/Ifc2x3.h" diff --git a/src/serializers/ColladaSerializer.h b/src/serializers/ColladaSerializer.h index d85dc989a0..5f58bf49b4 100644 --- a/src/serializers/ColladaSerializer.h +++ b/src/serializers/ColladaSerializer.h @@ -41,7 +41,7 @@ #pragma GCC diagnostic pop #endif -#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" +#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h" #include "../serializers/GeometrySerializer.h" diff --git a/src/serializers/GeometrySerializer.h b/src/serializers/GeometrySerializer.h index 45b14d8660..ff50154f29 100644 --- a/src/serializers/GeometrySerializer.h +++ b/src/serializers/GeometrySerializer.h @@ -27,8 +27,8 @@ typedef float real_t; #endif #include "../serializers/Serializer.h" -#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" -#include "../ifcgeom_schema_agnostic/IfcGeomElement.h" +#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h" +#include "../ifcgeom/schema_agnostic/IfcGeomElement.h" class SerializerSettings : public IfcGeom::IteratorSettings { diff --git a/src/serializers/OpenCascadeBasedSerializer.h b/src/serializers/OpenCascadeBasedSerializer.h index e1f78e1401..dd673024b9 100644 --- a/src/serializers/OpenCascadeBasedSerializer.h +++ b/src/serializers/OpenCascadeBasedSerializer.h @@ -20,8 +20,8 @@ #ifndef OPENCASCADEBASEDSERIALIZER_H #define OPENCASCADEBASEDSERIALIZER_H -#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" -#include "../ifcgeom/OpenCascadeConversionResult.h" +#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h" +#include "../ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h" #include "../serializers/GeometrySerializer.h" class OpenCascadeBasedSerializer : public GeometrySerializer { diff --git a/src/serializers/StepSerializer.h b/src/serializers/StepSerializer.h index 5b31bace6e..5152c5d362 100644 --- a/src/serializers/StepSerializer.h +++ b/src/serializers/StepSerializer.h @@ -23,7 +23,7 @@ #include #include -#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h" +#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h" #include "../serializers/OpenCascadeBasedSerializer.h" diff --git a/src/serializers/WavefrontObjSerializer.cpp b/src/serializers/WavefrontObjSerializer.cpp index bb5e4a8f8b..f416487b67 100644 --- a/src/serializers/WavefrontObjSerializer.cpp +++ b/src/serializers/WavefrontObjSerializer.cpp @@ -20,7 +20,7 @@ #include "WavefrontObjSerializer.h" -#include "../ifcgeom_schema_agnostic/IfcGeomRenderStyles.h" +#include "../ifcgeom/schema_agnostic/IfcGeomRenderStyles.h" #include #include diff --git a/src/serializers/schema_dependent/XmlSerializer.cpp b/src/serializers/schema_dependent/XmlSerializer.cpp index bc0fa96b64..f4e2f10516 100644 --- a/src/serializers/schema_dependent/XmlSerializer.cpp +++ b/src/serializers/schema_dependent/XmlSerializer.cpp @@ -29,7 +29,7 @@ #include #include "../../ifcparse/IfcSIPrefix.h" -#include "../../ifcgeom/IfcGeom.h" +#include "../../ifcgeom/kernels/opencascade/IfcGeom.h" using boost::property_tree::ptree;