Rename

cmake/CMakeLists.txt

@@ -551,7 +551,7 @@ if(NOT MSVC)
     endif()
 endif()
 
-set(IFCOPENSHELL_LIBRARIES IfcParse IfcGeom_ifc2x3 IfcGeom_ifc4 Iterator)
+set(IFCOPENSHELL_LIBRARIES IfcParse IfcGeom_ifc2x3 IfcGeom_ifc4 IfcGeom)
 
 # IfcParse
 file(GLOB IFCPARSE_H_FILES ../src/ifcparse/*.h)
@@ -580,14 +580,14 @@ set_target_properties(IfcGeom_ifc4 PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS
 TARGET_LINK_LIBRARIES(IfcGeom_ifc2x3 IfcParse ${OPENCASCADE_LIBRARIES})
 TARGET_LINK_LIBRARIES(IfcGeom_ifc4 IfcParse ${OPENCASCADE_LIBRARIES})
 
-# Iterator
-file(GLOB ITERATOR_H_FILES ../src/iterator/*.h)
-file(GLOB ITERATOR_CPP_FILES ../src/iterator/*.cpp)
-set(ITERATOR_FILES ${ITERATOR_H_FILES} ${ITERATOR_CPP_FILES})
+# IfcGeom (schema agnostic)
+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(Iterator ${ITERATOR_FILES})
-set_target_properties(Iterator PROPERTIES COMPILE_FLAGS -DIFC_GEOM_EXPORTS)
-TARGET_LINK_LIBRARIES(Iterator IfcGeom_ifc2x3 IfcGeom_ifc4)
+add_library(IfcGeom ${SCHEMA_AGNOSTIC_FILES})
+set_target_properties(IfcGeom PROPERTIES COMPILE_FLAGS -DIFC_GEOM_EXPORTS)
+TARGET_LINK_LIBRARIES(IfcGeom IfcGeom_ifc2x3 IfcGeom_ifc4)
 
 # IfcConvert
 file(GLOB IFCCONVERT_CPP_FILES ../src/ifcconvert/*.cpp)

src/ifcconvert/ColladaSerializer.h

@@ -41,7 +41,7 @@
 #pragma GCC diagnostic pop
 #endif
 
-#include "../iterator/IfcGeomIterator.h"
+#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
 
 #include "../ifcconvert/GeometrySerializer.h"
 

src/ifcconvert/GeometrySerializer.h

@@ -27,7 +27,7 @@ typedef float real_t;
 #endif
 
 #include "../ifcconvert/Serializer.h"
-#include "../iterator/IfcGeomIterator.h"
+#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
 #include "../ifcgeom/IfcGeomElement.h"
 
 class SerializerSettings : public IfcGeom::IteratorSettings

src/ifcconvert/IfcConvert.cpp

@@ -32,7 +32,7 @@
 #include "../ifcconvert/WavefrontObjSerializer.h"
 #include "../ifcconvert/SvgSerializer.h"
 
-#include "../iterator/IfcGeomIterator.h"
+#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
 
 #include <IGESControl_Controller.hxx>
 #include <Standard_Version.hxx>

src/ifcconvert/OpenCascadeBasedSerializer.h

@@ -20,7 +20,7 @@
 #ifndef OPENCASCADEBASEDSERIALIZER_H
 #define OPENCASCADEBASEDSERIALIZER_H
 
-#include "../iterator/IfcGeomIterator.h"
+#include "../ifcgeom_schema_agnostic/IfcGeomIterator.h"
 
 #include "../ifcconvert/GeometrySerializer.h"
 

src/ifcconvert/StepSerializer.h

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

src/ifcconvert/WavefrontObjSerializer.cpp

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

src/ifcgeom/IfcGeom.h

@@ -54,7 +54,7 @@ inline static bool ALMOST_THE_SAME(const T& a, const T& b, double tolerance=ALMO
 #include "../ifcgeom/IfcRepresentationShapeItem.h"
 #include "../ifcgeom/IfcGeomShapeType.h"
 
-#include "../iterator/Kernel.h"
+#include "../ifcgeom_schema_agnostic/Kernel.h"
 
 #include "ifc_geom_api.h"
 

src/ifcgeom/IfcGeomIteratorImplementation.cpp

@@ -1,5 +1,5 @@
 #include "IfcGeomIteratorImplementation.h"
-#include "../iterator/IteratorImplementation.h"
+#include "../ifcgeom_schema_agnostic/IteratorImplementation.h"
 
 namespace IfcGeom {
 	template class MAKE_TYPE_NAME(IteratorImplementation_)<float>;

src/ifcgeom/IfcGeomIteratorImplementation.h

@@ -77,12 +77,12 @@
 
 #include "../ifcgeom/IfcGeom.h"
 #include "../ifcgeom/IfcGeomElement.h"
-#include "../iterator/IfcGeomMaterial.h"
+#include "../ifcgeom_schema_agnostic/IfcGeomMaterial.h"
 #include "../ifcgeom/IfcGeomIteratorSettings.h"
 #include "../ifcgeom/IfcRepresentationShapeItem.h"
 #include "../ifcgeom/IfcGeomFilter.h"
 
-#include "../iterator/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/IfcGeomRepresentation.h

@@ -35,7 +35,7 @@
 #include <Geom_SphericalSurface.hxx>
 
 #include "../ifcgeom/IfcGeomIteratorSettings.h"
-#include "../iterator/IfcGeomMaterial.h"
+#include "../ifcgeom_schema_agnostic/IfcGeomMaterial.h"
 #include "../ifcgeom/IfcRepresentationShapeItem.h"
 
 #include <TopoDS_Compound.hxx>

src/ifcgeom/IfcRepresentationShapeItem.h

@@ -23,7 +23,7 @@
 #include <gp_GTrsf.hxx>
 #include <TopoDS_Shape.hxx>
 
-#include "../iterator/IfcGeomRenderStyles.h"
+#include "../ifcgeom_schema_agnostic/IfcGeomRenderStyles.h"
 
 namespace IfcGeom {	
 	class IFC_GEOM_API IfcRepresentationShapeItem {

src/ifcgeom_schema_agnostic/IfcGeomIterator.h

@@ -58,7 +58,7 @@
 #ifndef IFCGEOMITERATOR_H
 #define IFCGEOMITERATOR_H
 
-#include "../iterator/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/IfcGeomMaterial.h

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

src/ifcgeom_schema_agnostic/SurfaceStyle.cpp

@@ -1,4 +1,4 @@
-#include "../iterator/IfcGeomRenderStyles.h"
+#include "../ifcgeom_schema_agnostic/IfcGeomRenderStyles.h"
 
 #include <map>