Shuffle project structure

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/kernel_agnostic/*.h)
-file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/*.h)
+file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/kernel_agnostic/*.cpp)
-file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/*.cpp)
 set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES})
 
-foreach(schema 2x3 4)
+add_library(IfcGeom_ifc${schema} ${IFCGEOM_FILES})
-add_library(IfcGeom_occt_ifc${schema} ${IFCGEOM_FILES})
+set_target_properties(IfcGeom_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema} -DUSE_IFC${schema}")
-set_target_properties(IfcGeom_occt_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema} -DUSE_IFC${schema}")
+target_link_libraries(IfcGeom_ifc${schema} IfcParse)
-TARGET_LINK_LIBRARIES(IfcGeom_occt_ifc${schema} IfcParse ${OPENCASCADE_LIBRARIES})
+list(APPEND IfcGeom_libraries IfcGeom_ifc${schema})
-list(APPEND IfcGeom_libraries IfcGeom_occt_ifc${schema})
-endforeach()
 
-### CGAL
+foreach(kernel opencascade cgal)
+string(TOUPPER ${kernel} KERNEL_UPPER)
 
-# IfcGeom, schema dependent, CGAL
+file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/${kernel}/*.h)
-file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/cgal/*.h)
+file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/kernels/${kernel}/*.cpp)
-file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/kernels/cgal/*.cpp)
 set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES})
 
-foreach(schema 2x3 4)
+add_library(IfcGeom_${kernel}_ifc${schema} ${IFCGEOM_FILES})
-add_library(IfcGeom_cgal_ifc${schema} ${IFCGEOM_FILES})
+set_target_properties(IfcGeom_${kernel}_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema} -DUSE_IFC${schema}")
-set_target_properties(IfcGeom_cgal_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})
-TARGET_LINK_LIBRARIES(IfcGeom_cgal_ifc${schema} IfcParse ${OPENCASCADE_LIBRARIES})
+list(APPEND IfcGeom_libraries IfcGeom_${kernel}_ifc${schema})
-list(APPEND IfcGeom_libraries IfcGeom_cgal_ifc${schema})
 endforeach()
 
-# IfcGeom, schema and kernel agnostic
+endforeach()
-file(GLOB SCHEMA_AGNOSTIC_H_FILES ../src/ifcgeom_schema_agnostic/*.h)
+
-file(GLOB SCHEMA_AGNOSTIC_CPP_FILES ../src/ifcgeom_schema_agnostic/*.cpp)
+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}

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 <vld.h>

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 <vld.h>

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/IfcGeomFilter.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
+#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomRenderStyles.h"
+#include "../ifcgeom/schema_agnostic/IfcGeomRenderStyles.h"
 
 #include <Standard_Version.hxx>
 

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 {
 

src/ifcgeom/kernels/cgal/CgalEntityMapping.cpp

@@ -17,9 +17,6 @@
 *                                                                              *
 ********************************************************************************/
 
-#include "../../../ifcgeom/IfcGeomShapeType.h"
-#include "../../../ifcgeom/IfcGeom.h"
-
 #include "CgalKernel.h"
 #include "CgalConversionResult.h"
 

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<double>* IfcGeom::CgalKernel::create_brep_for_representation_and_product(
+template <typename P, typename PP>
+IfcGeom::NativeElement<P, PP>* 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<double>* IfcGeom::CgalKernel::create_brep_for_representat
 		context_string = representation->ContextOfItems()->ContextType();
 	}
 
-	return new NativeElement<double>(
+	return new NativeElement<P, PP>(
 		product->data().id(),
 		parent_id,
 		name,
@@ -152,9 +150,10 @@ IfcGeom::NativeElement<double>* IfcGeom::CgalKernel::create_brep_for_representat
 	);
 }
 
-IfcGeom::NativeElement<double>* IfcGeom::CgalKernel::create_brep_for_processed_representation(
+template <typename P, typename PP>
+IfcGeom::NativeElement<P, PP>* IfcGeom::CgalKernel::create_brep_for_processed_representation(
 	const IteratorSettings& /*settings*/, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product,
-	IfcGeom::NativeElement<double>* brep)
+	IfcGeom::NativeElement<P, PP>* brep)
 {
 	int parent_id = -1;
 	try {
@@ -183,7 +182,7 @@ IfcGeom::NativeElement<double>* IfcGeom::CgalKernel::create_brep_for_processed_r
 
 	const std::string product_type = product->declaration().name();
 
-	return new NativeElement<double>(
+	return new NativeElement<P, PP>(
 		product->data().id(),
 		parent_id,
 		name,
@@ -195,3 +194,17 @@ IfcGeom::NativeElement<double>* IfcGeom::CgalKernel::create_brep_for_processed_r
 		product
 	);
 }
+
+template IFC_GEOM_API IfcGeom::NativeElement<float, float>* IfcGeom::CgalKernel::create_brep_for_representation_and_product<float, float>(
+	const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product);
+template IFC_GEOM_API IfcGeom::NativeElement<float, double>* IfcGeom::CgalKernel::create_brep_for_representation_and_product<float, double>(
+	const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product);
+template IFC_GEOM_API IfcGeom::NativeElement<double, double>* IfcGeom::CgalKernel::create_brep_for_representation_and_product<double, double>(
+	const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product);
+
+template IFC_GEOM_API IfcGeom::NativeElement<float, float>* IfcGeom::CgalKernel::create_brep_for_processed_representation<float, float>(
+	const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product, IfcGeom::NativeElement<float, float>* brep);
+template IFC_GEOM_API IfcGeom::NativeElement<float, double>* IfcGeom::CgalKernel::create_brep_for_processed_representation<float, double>(
+	const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product, IfcGeom::NativeElement<float, double>* brep);
+template IFC_GEOM_API IfcGeom::NativeElement<double, double>* IfcGeom::CgalKernel::create_brep_for_processed_representation<double, double>(
+	const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product, IfcGeom::NativeElement<double, double>* brep);

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<double>* create_brep_for_representation_and_product(
+
+		template <typename P, typename PP>
+		IfcGeom::NativeElement<P, PP>* create_brep_for_representation_and_product(
 			const IteratorSettings&, IfcSchema::IfcRepresentation*, IfcSchema::IfcProduct*);
-		virtual IfcGeom::NativeElement<double>* create_brep_for_processed_representation(
+
-			const IteratorSettings&, IfcSchema::IfcRepresentation*, IfcSchema::IfcProduct*, IfcGeom::NativeElement<double>*);
+		template <typename P, typename PP>
+		IfcGeom::NativeElement<P, PP>* create_brep_for_processed_representation(
+			const IteratorSettings&, IfcSchema::IfcRepresentation*, IfcSchema::IfcProduct*, IfcGeom::NativeElement<P, PP>*);
+
 
 #include "CgalEntityMappingDeclaration.h"
 

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 <BRep_Builder.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 
-#include "../ifcparse/macros.h"
+#include "../../../ifcparse/macros.h"
-#include "../ifcparse/IfcParse.h"
+#include "../../../ifcparse/IfcParse.h"
-#include "../ifcparse/IfcBaseClass.h"
+#include "../../../ifcparse/IfcBaseClass.h"
 
-#include "../ifcgeom_schema_agnostic/IfcGeomElement.h" 
+#include "../../../ifcgeom/schema_agnostic/IfcGeomElement.h" 
-#include "../ifcgeom_schema_agnostic/IfcGeomRepresentation.h" 
+#include "../../../ifcgeom/schema_agnostic/IfcGeomRepresentation.h" 
-#include "../ifcgeom_schema_agnostic/ConversionResult.h"
+#include "../../../ifcgeom/schema_agnostic/ConversionResult.h"
-#include "../ifcgeom/IfcGeomShapeType.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)
+#define INCLUDE_SCHEMA(x) STRINGIFY(../../../ifcparse/x.h)
-#include INCLUDE_PARENT_DIR(IfcSchema)
+#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)

src/ifcgeom/kernels/opencascade/IfcGeomCurves.cpp

@@ -81,7 +81,7 @@
 #include <Geom_BSplineCurve.hxx>
 #endif
 
-#include "../ifcgeom/IfcGeom.h"
+#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h"
 
 #define Kernel MAKE_TYPE_NAME(Kernel)
 

src/ifcgeom/kernels/opencascade/IfcGeomFaces.cpp

@@ -102,7 +102,7 @@
 #include <TColStd_Array1OfInteger.hxx>
 #endif
 
-#include "../ifcgeom/IfcGeom.h"
+#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h"
 
 #define Kernel MAKE_TYPE_NAME(Kernel)
 

src/ifcgeom/kernels/opencascade/IfcGeomFunctions.cpp

@@ -146,11 +146,11 @@
 #include <Extrema_ExtPC.hxx>
 #include <BRepAdaptor_Curve.hxx>
 
-#include "../ifcparse/macros.h"
+#include "../../../ifcparse/macros.h"
-#include "../ifcparse/IfcSIPrefix.h"
+#include "../../../ifcparse/IfcSIPrefix.h"
-#include "../ifcparse/IfcFile.h"
+#include "../../../ifcparse/IfcFile.h"
-#include "../ifcgeom/IfcGeom.h"
+#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h"
-#include "../ifcgeom/IfcGeomTree.h"
+#include "../../../ifcgeom/kernels/opencascade/IfcGeomTree.h"
 
 #include <memory>
 

src/ifcgeom/kernels/opencascade/IfcGeomHelpers.cpp

@@ -75,7 +75,7 @@
 
 #include <TopLoc_Location.hxx>
 
-#include "../ifcgeom/IfcGeom.h"
+#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h"
 
 #define Kernel MAKE_TYPE_NAME(Kernel)
 

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_)<float, float>;

src/ifcgeom/kernels/opencascade/IfcGeomIteratorImplementation.h

@@ -73,16 +73,16 @@
 #include <gp_Trsf.hxx>
 #include <gp_Trsf2d.hxx>
 
-#include "../ifcparse/IfcFile.h"
+#include "../../../ifcparse/IfcFile.h"
 
-#include "../ifcgeom/IfcGeom.h"
+#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomElement.h"
+#include "../../../ifcgeom/schema_agnostic/IfcGeomElement.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomMaterial.h"
+#include "../../../ifcgeom/schema_agnostic/IfcGeomMaterial.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h"
+#include "../../../ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h"
-#include "../ifcgeom_schema_agnostic/ConversionResult.h"
+#include "../../../ifcgeom/schema_agnostic/ConversionResult.h"
 
-#include "../ifcgeom_schema_agnostic/IfcGeomFilter.h"
+#include "../../../ifcgeom/schema_agnostic/IfcGeomFilter.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

src/ifcgeom/kernels/opencascade/IfcGeomShapes.cpp

@@ -101,7 +101,7 @@
 
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
-#include "../ifcgeom/IfcGeom.h"
+#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h"
 
 #include <memory>
 

src/ifcgeom/kernels/opencascade/IfcGeomTree.h

@@ -20,10 +20,10 @@
 #ifndef IFCGEOMTREE_H
 #define IFCGEOMTREE_H
 
-#include "../ifcparse/IfcFile.h"
+#include "../../../ifcparse/IfcFile.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomElement.h"
+#include "../../../ifcgeom/schema_agnostic/IfcGeomElement.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
+#include "../../../ifcgeom/schema_agnostic/IfcGeomIterator.h"
-#include "../ifcgeom_schema_agnostic/Kernel.h"
+#include "../../../ifcgeom/schema_agnostic/Kernel.h"
 
 #include <NCollection_UBTree.hxx>
 #include <BRepBndLib.hxx>

src/ifcgeom/kernels/opencascade/IfcGeomWires.cpp

@@ -95,7 +95,7 @@
 #include <BRepAdaptor_HCompCurve.hxx>
 #include <Approx_Curve3d.hxx>
 
-#include "../ifcgeom/IfcGeom.h"
+#include "../../../ifcgeom/kernels/opencascade/IfcGeom.h"
 
 #define Kernel MAKE_TYPE_NAME(Kernel)
 

src/ifcgeom/kernels/opencascade/IfcRegister.h

@@ -38,8 +38,8 @@
 #include <gp_Trsf.hxx>
 #include <gp_Trsf2d.hxx>
 
-#include "../ifcparse/IfcBaseClass.h"
+#include "../../../ifcparse/IfcBaseClass.h"
-#include "../ifcparse/IfcParse.h"
+#include "../../../ifcparse/IfcParse.h"
 
 SHAPES(IfcShellBasedSurfaceModel);
 SHAPES(IfcFaceBasedSurfaceModel);

src/ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h

@@ -34,7 +34,7 @@
 #include <BRepAdaptor_Curve.hxx>
 #include <GCPnts_QuasiUniformDeflection.hxx>
 
-#include "../ifcgeom_schema_agnostic/ConversionResult.h"
+#include "../../../ifcgeom/schema_agnostic/ConversionResult.h"
 
 namespace IfcGeom {
 

src/ifcgeom/kernels/opencascade/OpenCascadeShape.cpp

@@ -1,7 +1,7 @@
 #include "OpenCascadeConversionResult.h"
 
-#include "../ifcparse/IfcLogger.h"
+#include "../../../ifcparse/IfcLogger.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomRepresentation.h"
+#include "../../../ifcgeom/schema_agnostic/IfcGeomRepresentation.h"
 
 #include "IfcGeom.h"
 

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/IfcGeomRenderStyles.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h"
+#include "../../ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h"
 
 namespace IfcGeom {
 

src/ifcgeom/schema_agnostic/IfcGeomElement.h

@@ -23,10 +23,11 @@
 #include <string>
 #include <algorithm>
 
-#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 {

src/ifcgeom/schema_agnostic/IfcGeomFilter.h

@@ -23,8 +23,8 @@
 #ifndef IFCGEOMFILTER_H
 #define IFCGEOMFILTER_H
 
-#include "Kernel.h"
+#include "../../ifcgeom/schema_agnostic/Kernel.h"
-#include "../ifcparse/IfcFile.h"
+#include "../../ifcparse/IfcFile.h"
 
 #include <boost/foreach.hpp>
 #include <boost/function.hpp>

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

src/ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h

@@ -21,9 +21,9 @@
 #define IFCGEOMITERATORSETTINGS_H
 
 #include "ifc_geom_api.h"
-#include "../ifcparse/IfcException.h"
+#include "../../ifcparse/IfcException.h"
-#include "../ifcparse/IfcBaseClass.h"
+#include "../../ifcparse/IfcBaseClass.h"
-#include "../ifcparse/IfcLogger.h"
+#include "../../ifcparse/IfcLogger.h"
 
 namespace IfcGeom
 {

src/ifcgeom/schema_agnostic/IfcGeomMaterial.h

@@ -22,7 +22,7 @@
 
 #include <string>
 
-#include "../ifcgeom_schema_agnostic/IfcGeomRenderStyles.h"
+#include "../../ifcgeom/schema_agnostic/IfcGeomRenderStyles.h"
 
 namespace IfcGeom {	
 

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 <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/replace.hpp>

src/ifcgeom/schema_agnostic/IfcGeomRepresentation.cpp

@@ -27,8 +27,8 @@
 #include <BRepGProp.hxx>
 
 #include "IfcGeomRepresentation.h"
-#include "../ifcgeom/OpenCascadeConversionResult.h"
+#include "../../ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h"
-#include "../ifcgeom_schema_agnostic/Kernel.h"
+#include "../../ifcgeom/schema_agnostic/Kernel.h"
 
 IfcGeom::Representation::Serialization::Serialization(const BRep& brep)
 	: Representation(brep.settings())

src/ifcgeom/schema_agnostic/IfcGeomRepresentation.h

@@ -35,9 +35,9 @@
 #include <GCPnts_QuasiUniformDeflection.hxx>
 #include <Geom_SphericalSurface.hxx>
 
-#include "../ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h"
+#include "../../ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomMaterial.h"
+#include "../../ifcgeom/schema_agnostic/IfcGeomMaterial.h"
-#include "../ifcgeom_schema_agnostic/ConversionResult.h"
+#include "../../ifcgeom/schema_agnostic/ConversionResult.h"
 
 #include <TopoDS_Compound.hxx>
 

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 "../ifcparse/IfcFile.h"
+#include "../../ifcgeom/schema_agnostic/IfcGeomFilter.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h"
+#include "../../ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h"
 
 #include <gp_XYZ.hxx>
 

src/ifcgeom/schema_agnostic/Kernel.cpp

@@ -1,5 +1,8 @@
 #include "Kernel.h"
 
+#include "../../ifcparse/Ifc2x3.h"
+#include "../../ifcparse/Ifc4.h"
+
 #include <TopExp.hxx>
 #include <TopTools_ListOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>

src/ifcgeom/schema_agnostic/Kernel.h

@@ -1,12 +1,9 @@
 #ifndef ITERATOR_KERNEL_H
 #define ITERATOR_KERNEL_H
 
-#include "../ifcparse/IfcFile.h"
+#include "../../ifcparse/IfcFile.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomIteratorSettings.h"
+#include "../../ifcgeom/schema_agnostic/IfcGeomIteratorSettings.h"
-#include "../ifcgeom_schema_agnostic/ConversionResult.h"
+#include "../../ifcgeom/schema_agnostic/ConversionResult.h"
-
-#include "../ifcparse/Ifc2x3.h"
-#include "../ifcparse/Ifc4.h"
 
 #include <boost/function.hpp>
 

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 <TopoDS_Shape.hxx>
 

src/ifcgeom/schema_agnostic/SurfaceStyle.cpp

@@ -1,4 +1,4 @@
-#include "../ifcgeom_schema_agnostic/IfcGeomRenderStyles.h"
+#include "../../ifcgeom/schema_agnostic/IfcGeomRenderStyles.h"
 
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>

src/ifcgeomserver/IfcGeomServer.cpp

@@ -38,8 +38,8 @@
 #include <fcntl.h>
 #endif
 
-#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
+#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomElement.h"
+#include "../ifcgeom/schema_agnostic/IfcGeomElement.h"
 #include "../ifcparse/IfcFile.h"
 #include "../ifcparse/IfcLogger.h"
 

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 <string>
 #include <sstream>

src/ifcwrap/IfcPython.i

@@ -70,8 +70,8 @@
 }
 
 %module ifcopenshell_wrapper %{
-	#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
+	#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h"
-	#include "../ifcgeom_schema_agnostic/Serialization.h"
+	#include "../ifcgeom/schema_agnostic/Serialization.h"
 	#include "../ifcgeom/IfcGeomTree.h"
 	
 	#include "../ifcparse/Ifc2x3.h"

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"
 

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/IfcGeomIterator.h"
-#include "../ifcgeom_schema_agnostic/IfcGeomElement.h"
+#include "../ifcgeom/schema_agnostic/IfcGeomElement.h"
 
 class SerializerSettings : public IfcGeom::IteratorSettings
 {

src/serializers/OpenCascadeBasedSerializer.h

@@ -20,8 +20,8 @@
 #ifndef OPENCASCADEBASEDSERIALIZER_H
 #define OPENCASCADEBASEDSERIALIZER_H
 
-#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
+#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h"
-#include "../ifcgeom/OpenCascadeConversionResult.h"
+#include "../ifcgeom/kernels/opencascade/OpenCascadeConversionResult.h"
 #include "../serializers/GeometrySerializer.h"
 
 class OpenCascadeBasedSerializer : public GeometrySerializer {

src/serializers/StepSerializer.h

@@ -23,7 +23,7 @@
 #include <STEPControl_Writer.hxx>
 #include <Interface_Static.hxx>
 
-#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
+#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h"
 
 #include "../serializers/OpenCascadeBasedSerializer.h"
 

src/serializers/WavefrontObjSerializer.cpp

@@ -20,7 +20,7 @@
 
 #include "WavefrontObjSerializer.h"
 
-#include "../ifcgeom_schema_agnostic/IfcGeomRenderStyles.h"
+#include "../ifcgeom/schema_agnostic/IfcGeomRenderStyles.h"
 
 #include <boost/lexical_cast.hpp>
 #include <iomanip>

src/serializers/schema_dependent/XmlSerializer.cpp

@@ -29,7 +29,7 @@
 #include <algorithm>
 
 #include "../../ifcparse/IfcSIPrefix.h"
-#include "../../ifcgeom/IfcGeom.h"
+#include "../../ifcgeom/kernels/opencascade/IfcGeom.h"
 
 using boost::property_tree::ptree;