Proceed with merge

src/ifcconvert/IfcConvert.cpp

@@ -35,10 +35,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/base_utils.h"
+#include "../ifcgeom/IfcGeomFilter.h"
+#include "../ifcgeom/Iterator.h"
+#include "../ifcgeom/IfcGeomRenderStyles.h"
 
 #include "../ifcparse/utils.h"
 
@@ -212,6 +211,7 @@ int main(int argc, char** argv) {
 	path_t log_file;
 	path_t cache_file;
 	std::string log_format;
+	std::string geometry_kernel;
 
     po::options_description generic_options("Command line options");
 	verbosity_counter vcounter;
@@ -249,9 +249,19 @@ int main(int argc, char** argv) {
 
 	int num_threads;
 	std::string offset_str, rotation_str;
+
+	std::string default_kernel;
+#ifdef IFOPSH_WITH_CGAL
+	default_kernel = "cgal";
+#endif
+#ifdef IFOPSH_WITH_OPENCASCADE
+	default_kernel = "opencascade";
+#endif
     
 	po::options_description geom_options("Geometry options");
 	geom_options.add_options()
+		("kernel", po::value<std::string>(&geometry_kernel)->default_value(default_kernel),
+			"Geometry kernel to use (opencascade or cgal).")
 		("threads,j", po::value<int>(&num_threads)->default_value(1),
 			"Number of parallel processing threads for geometry interpretation.")
 		("plan",
@@ -799,7 +809,7 @@ int main(int argc, char** argv) {
 	SerializerSettings settings;
 	/// @todo Make APPLY_DEFAULT_MATERIALS configurable? Quickly tested setting this to false and using obj exporter caused the program to crash and burn.
 	settings.set(IfcGeom::IteratorSettings::APPLY_DEFAULT_MATERIALS,      true);
-	settings.set(IfcGeom::IteratorSettings::USE_WORLD_COORDS,             use_world_coords || output_extension == OBJ);
+	settings.set(IfcGeom::IteratorSettings::USE_WORLD_COORDS,             use_world_coords || output_extension == OBJ || output_extension == STP || output_extension == IGS);
 	settings.set(IfcGeom::IteratorSettings::WELD_VERTICES,                weld_vertices);
 	settings.set(IfcGeom::IteratorSettings::SEW_SHELLS,                   orient_shells || output_extension == SVG); // svg depends on correct solids for boolean subtractions for hlr
 	settings.set(IfcGeom::IteratorSettings::CONVERT_BACK_UNITS,           convert_back_units);
@@ -835,7 +845,7 @@ int main(int argc, char** argv) {
 
 	if (vmap.count("force-space-transparency")) {
 		settings.force_space_transparency(force_space_transparency);
-		IfcGeom::update_default_style("IfcSpace").Transparency().reset(force_space_transparency);
+		IfcGeom::update_default_style("IfcSpace").transparency = force_space_transparency;
 	}
 
 	boost::shared_ptr<GeometrySerializer> serializer; /**< @todo use std::unique_ptr when possible */
@@ -950,7 +960,7 @@ int main(int argc, char** argv) {
 				return EXIT_FAILURE;
 			}
 
-			IfcGeom::Iterator tmp_context_iterator(settings, ifc_file, filter_funcs, num_threads);
+			IfcGeom::Iterator tmp_context_iterator(geometry_kernel, settings, ifc_file, filter_funcs, num_threads);
 			
 			time_t start, end;
 			time(&start);
@@ -973,10 +983,10 @@ int main(int argc, char** argv) {
 			time(&end);
             if (!quiet) Logger::Status("Done ! Bounds computed in " + format_duration(start, end));
 
-            gp_XYZ center = (tmp_context_iterator.bounds_min() + tmp_context_iterator.bounds_max()) * 0.5;
-            offset[0] = -center.X();
-            offset[1] = -center.Y();
-            offset[2] = -center.Z();
+            auto center = (tmp_context_iterator.bounds_min().ccomponents() + tmp_context_iterator.bounds_max().ccomponents()) * 0.5;
+            offset[0] = -center(0);
+            offset[1] = -center(1);
+            offset[2] = -center(2);
         } else {
             if (sscanf(offset_str.c_str(), "%lf;%lf;%lf", &offset[0], &offset[1], &offset[2]) != 3) {
                 cerr_ << "[Error] Invalid use of --model-offset\n";
@@ -991,7 +1001,7 @@ int main(int argc, char** argv) {
         Logger::Notice(msg.str());
     }
 
-	IfcGeom::Iterator context_iterator(settings, ifc_file, filter_funcs, num_threads);
+	IfcGeom::Iterator context_iterator(geometry_kernel, settings, ifc_file, filter_funcs, num_threads);
 
 #ifdef WITH_HDF5
 	std::unique_ptr<HdfSerializer> cache;
@@ -1107,7 +1117,7 @@ int main(int argc, char** argv) {
 	// The functions IfcGeom::Iterator::get() and IfcGeom::Iterator::next() 
 	// wrap an iterator of all geometrical products in the Ifc file. 
 	// IfcGeom::Iterator::get() returns an IfcGeom::TriangulationElement or 
-	// -BRepElement pointer, based on current settings. (see IfcGeomIterator.h 
+	// -BRepElement pointer, based on current settings. (see Iterator.h 
 	// for definition) IfcGeom::Iterator::next() is used to poll whether more 
 	// geometrical entities are available. None of these functions throw 
 	// exceptions, neither for parsing errors or geometrical errors. Upon 
@@ -1539,7 +1549,7 @@ void fix_quantities(IfcParse::IfcFile& f, bool no_progress, bool quiet, bool std
 	settings.set(IfcGeom::IteratorSettings::CONVERT_BACK_UNITS, true);
 	settings.set(IfcGeom::IteratorSettings::DISABLE_TRIANGULATION, true);
 
-	IfcGeom::Iterator context_iterator(settings, &f);
+	IfcGeom::Iterator context_iterator(settings, &f, {}, 1);
 
 	if (!context_iterator.initialize()) {
 		return;
@@ -1586,7 +1596,8 @@ void fix_quantities(IfcParse::IfcFile& f, bool no_progress, bool quiet, bool std
 		}
 
 		if (geom_object && geom_object->geometry_pointer() == previous_geometry_pointer) {
-			objects->push(geom_object->product());
+			// @todo
+			objects->push(const_cast<IfcUtil::IfcBaseEntity*>(geom_object->product()));
 		} else {
 			if (quantity) {
 				auto rel = latebound_access::create(f, "IfcRelDefinesByProperties");
@@ -1633,7 +1644,7 @@ void fix_quantities(IfcParse::IfcFile& f, bool no_progress, bool quiet, bool std
 				auto quantity_count = latebound_access::create(f, "IfcQuantityCount");
 				latebound_access::set(quantity_count, "Name", std::string("Surface Genus"));
 				latebound_access::set(quantity_count, "Description", '#' + boost::lexical_cast<std::string>(part.ItemId()));
-				latebound_access::set(quantity_count, "CountValue", IfcGeom::util::surface_genus(part.Shape()));
+				latebound_access::set(quantity_count, "CountValue", part.Shape()->surface_genus());
 
 				quantities_2->push(quantity_count);				
 			}
@@ -1647,7 +1658,8 @@ void fix_quantities(IfcParse::IfcFile& f, bool no_progress, bool quiet, bool std
 			}
 
 			objects.reset(new aggregate_of_instance);
-			objects->push(geom_object->product());
+			// @todo
+			objects->push(const_cast<IfcUtil::IfcBaseEntity*>(geom_object->product()));
 		}
 
 		previous_geometry_pointer = geom_object->geometry_pointer();

src/ifcconvert/validate_space_boundaries.cpp

@@ -43,14 +43,14 @@ void fix_spaceboundaries(IfcParse::IfcFile& f, bool no_progress, bool quiet, boo
 		return;
 	}
 
-	ifcopenshell::geometry::settings settings;
+	IfcGeom::IteratorSettings settings;
 
-	settings.set(ifcopenshell::geometry::settings::USE_WORLD_COORDS, false);
-	settings.set(ifcopenshell::geometry::settings::WELD_VERTICES, false);
-	settings.set(ifcopenshell::geometry::settings::SEW_SHELLS, true);
-	settings.set(ifcopenshell::geometry::settings::CONVERT_BACK_UNITS, true);
-	settings.set(ifcopenshell::geometry::settings::DISABLE_TRIANGULATION, true);
-	settings.set(ifcopenshell::geometry::settings::DISABLE_OPENING_SUBTRACTIONS, true);
+	settings.set(IfcGeom::IteratorSettings::USE_WORLD_COORDS, false);
+	settings.set(IfcGeom::IteratorSettings::WELD_VERTICES, false);
+	settings.set(IfcGeom::IteratorSettings::SEW_SHELLS, true);
+	settings.set(IfcGeom::IteratorSettings::CONVERT_BACK_UNITS, true);
+	settings.set(IfcGeom::IteratorSettings::DISABLE_TRIANGULATION, true);
+	settings.set(IfcGeom::IteratorSettings::DISABLE_OPENING_SUBTRACTIONS, true);
 
 	ifcopenshell::geometry::Converter c("cgal", &f2, settings);
 
@@ -72,7 +72,7 @@ void fix_spaceboundaries(IfcParse::IfcFile& f, bool no_progress, bool quiet, boo
 				for (auto& e : wire->children) {
 					auto edge = (taxonomy::edge*) e;
 					auto p3 = boost::get<taxonomy::point3>(edge->start);
-					auto p4 = *((taxonomy::geom_item*)item)->matrix.components * p3.components->homogeneous();
+					auto p4 = ((taxonomy::geom_item*)item)->matrix.ccomponents() * p3.ccomponents().homogeneous();
 					Kernel_::Point_3 P(p4(0), p4(1), p4(2));
 					elem_to_space_boundary_coords[{g1, g2}].emplace_back(P);
 				}

src/ifcconvert/validate_storey_containment.cpp

@@ -1,6 +1,6 @@
 #include "../ifcgeom/kernels/cgal/CgalKernel.h"
-#include "../ifcgeom/schema_agnostic/IfcGeomFilter.h"
-#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h"
+#include "../ifcgeom/IfcGeomFilter.h"
+#include "../ifcgeom/Iterator.h"
 
 #include <CGAL/Polygon_mesh_processing/measure.h>
 #include <CGAL/Polygon_mesh_processing/bbox.h>
@@ -8,29 +8,29 @@
 #include <algorithm>
 
 void fix_storeycontainment(IfcParse::IfcFile& f, bool no_progress, bool quiet, bool stderr_progress) {
-	ifcopenshell::geometry::settings settings;
-	settings.set(ifcopenshell::geometry::settings::USE_WORLD_COORDS, false);
-	settings.set(ifcopenshell::geometry::settings::WELD_VERTICES, false);
-	settings.set(ifcopenshell::geometry::settings::SEW_SHELLS, true);
-	settings.set(ifcopenshell::geometry::settings::CONVERT_BACK_UNITS, true);
-	settings.set(ifcopenshell::geometry::settings::DISABLE_TRIANGULATION, true);
-	settings.set(ifcopenshell::geometry::settings::DISABLE_OPENING_SUBTRACTIONS, true);
+	IfcGeom::IteratorSettings settings;
+	settings.set(IfcGeom::IteratorSettings::USE_WORLD_COORDS, false);
+	settings.set(IfcGeom::IteratorSettings::WELD_VERTICES, false);
+	settings.set(IfcGeom::IteratorSettings::SEW_SHELLS, true);
+	settings.set(IfcGeom::IteratorSettings::CONVERT_BACK_UNITS, true);
+	settings.set(IfcGeom::IteratorSettings::DISABLE_TRIANGULATION, true);
+	settings.set(IfcGeom::IteratorSettings::DISABLE_OPENING_SUBTRACTIONS, true);
 
 	std::vector<ifcopenshell::geometry::filter_t> no_openings_and_spaces = {
 		IfcGeom::entity_filter(false, false, {"IfcOpeningElement", "IfcSpace"})
 	};
 
-	ifcopenshell::geometry::Iterator context_iterator("cgal", settings, &f, no_openings_and_spaces);
+	IfcGeom::Iterator context_iterator("cgal", settings, &f, no_openings_and_spaces, 1);
 
-	auto get_elevation = [](IfcUtil::IfcBaseClass* a) {
-		return ((IfcUtil::IfcBaseEntity*)a)->get_value_or<double>("Elevation", 0.);
+	auto get_elevation = [](const IfcUtil::IfcBaseClass* a) {
+		return ((const IfcUtil::IfcBaseEntity*)a)->get_value<double>("Elevation", 0.);
 	};
 
 	// latebound inverse attribute lookup not working
 	auto rels = f.instances_by_type("IfcRelContainedInSpatialStructure");
-	std::map<IfcUtil::IfcBaseClass*, IfcUtil::IfcBaseClass*> elem_to_storey;
+	std::map<const IfcUtil::IfcBaseClass*, const IfcUtil::IfcBaseClass*> elem_to_storey;
 	std::for_each(rels->begin(), rels->end(), [&elem_to_storey](IfcUtil::IfcBaseClass* r) {
-		auto elems = ((IfcUtil::IfcBaseEntity*)r)->get_value<IfcEntityList::ptr>("RelatedElements");
+		auto elems = ((IfcUtil::IfcBaseEntity*)r)->get_value<aggregate_of_instance::ptr>("RelatedElements");
 		auto storey = ((IfcUtil::IfcBaseEntity*)r)->get_value<IfcUtil::IfcBaseClass*>("RelatingStructure");
 
 		if (storey->declaration().name() == "IfcBuildingStorey") {
@@ -41,8 +41,8 @@ void fix_storeycontainment(IfcParse::IfcFile& f, bool no_progress, bool quiet, b
 	});	
 
 	auto storeys = f.instances_by_type("IfcBuildingStorey");
-	std::vector<IfcUtil::IfcBaseClass*> storeys_sorted(storeys->begin(), storeys->end());
-	std::sort(storeys_sorted.begin(), storeys_sorted.end(), [&get_elevation](IfcUtil::IfcBaseClass* a, IfcUtil::IfcBaseClass* b) {
+	std::vector<const IfcUtil::IfcBaseClass*> storeys_sorted(storeys->begin(), storeys->end());
+	std::sort(storeys_sorted.begin(), storeys_sorted.end(), [&get_elevation](const IfcUtil::IfcBaseClass* a, const IfcUtil::IfcBaseClass* b) {
 		return get_elevation(a) < get_elevation(b);
 	});
 
@@ -108,7 +108,7 @@ void fix_storeycontainment(IfcParse::IfcFile& f, bool no_progress, bool quiet, b
 		if (num_created) {
 			has_more = context_iterator.next();
 		}
-		ifcopenshell::geometry::NativeElement* geom_object = nullptr;
+		IfcGeom::BRepElement* geom_object = nullptr;
 		if (has_more) {
 			geom_object = context_iterator.get_native();
 		}
@@ -132,8 +132,8 @@ void fix_storeycontainment(IfcParse::IfcFile& f, bool no_progress, bool quiet, b
 
 		for (auto& g : geom_object->geometry()) {
 			auto s = ((ifcopenshell::geometry::CgalShape*) g.Shape())->shape();
-			const auto& m = *g.Placement().components;
-			const auto& n = *geom_object->transformation().data().components;
+			const auto& m = g.Placement().ccomponents();
+			const auto& n = geom_object->transformation().data().ccomponents();
 
 			const cgal_placement_t trsf(
 				m(0, 0), m(0, 1), m(0, 2), m(0, 3),

src/ifcconvert/validate_wall_connectivity.cpp

@@ -11,16 +11,16 @@ void fix_wallconnectivity(IfcParse::IfcFile& f, bool no_progress, bool quiet, bo
 	intersection_validator v(f, { "IfcWall" }, 1.e-3, no_progress, quiet, stderr_progress);
 
 
-	ifcopenshell::geometry::settings settings;
-	settings.set(ifcopenshell::geometry::settings::USE_WORLD_COORDS, false);
-	settings.set(ifcopenshell::geometry::settings::WELD_VERTICES, false);
-	settings.set(ifcopenshell::geometry::settings::SEW_SHELLS, true);
-	settings.set(ifcopenshell::geometry::settings::CONVERT_BACK_UNITS, true);
-	settings.set(ifcopenshell::geometry::settings::DISABLE_TRIANGULATION, true);
-	settings.set(ifcopenshell::geometry::settings::DISABLE_OPENING_SUBTRACTIONS, true);
+	IfcGeom::IteratorSettings settings;
+	settings.set(IfcGeom::IteratorSettings::USE_WORLD_COORDS, false);
+	settings.set(IfcGeom::IteratorSettings::WELD_VERTICES, false);
+	settings.set(IfcGeom::IteratorSettings::SEW_SHELLS, true);
+	settings.set(IfcGeom::IteratorSettings::CONVERT_BACK_UNITS, true);
+	settings.set(IfcGeom::IteratorSettings::DISABLE_TRIANGULATION, true);
+	settings.set(IfcGeom::IteratorSettings::DISABLE_OPENING_SUBTRACTIONS, true);
 
-	settings.set(ifcopenshell::geometry::settings::INCLUDE_CURVES, true);
-	settings.set(ifcopenshell::geometry::settings::EXCLUDE_SOLIDS_AND_SURFACES, true);
+	settings.set(IfcGeom::IteratorSettings::INCLUDE_CURVES, true);
+	settings.set(IfcGeom::IteratorSettings::EXCLUDE_SOLIDS_AND_SURFACES, true);
 	
 	ifcopenshell::geometry::Converter c("cgal", &f, settings);
 
@@ -106,7 +106,7 @@ void fix_wallconnectivity(IfcParse::IfcFile& f, bool no_progress, bool quiet, bo
 			return;
 		}
 
-		auto get_axis_parameter_min_max = [&c, &x_poly](IfcUtil::IfcBaseEntity* inst) {
+		auto get_axis_parameter_min_max = [&c, &x_poly](const IfcUtil::IfcBaseEntity* inst) {
 			auto item = c.mapping()->map(inst);
 			auto shaperep = ((taxonomy::collection*) item)->children[0];
 			auto loop = ((taxonomy::collection*) shaperep)->children[0];
@@ -123,8 +123,8 @@ void fix_wallconnectivity(IfcParse::IfcFile& f, bool no_progress, bool quiet, bo
 					auto p0 = boost::get<taxonomy::point3>(first_vertex);
 					auto p1 = boost::get<taxonomy::point3>(last_vertex);
 					
-					auto v0 = *((taxonomy::geom_item*)item)->matrix.components * p0.components->homogeneous();
-					auto v1 = *((taxonomy::geom_item*)item)->matrix.components * p1.components->homogeneous();
+					auto v0 = ((taxonomy::geom_item*)item)->matrix.ccomponents() * p0.ccomponents().homogeneous();
+					auto v1 = ((taxonomy::geom_item*)item)->matrix.ccomponents() * p1.ccomponents().homogeneous();
 
 					auto P0 = Kernel_::Point_3(v0(0), v0(1), v0(2));
 					auto P1 = Kernel_::Point_3(v1(0), v1(1), v1(2));

src/ifcconvert/validation_utils.h

@@ -1,6 +1,6 @@
 #include "../ifcgeom/kernels/cgal/CgalKernel.h"
-#include "../ifcgeom/schema_agnostic/IfcGeomFilter.h"
-#include "../ifcgeom/schema_agnostic/IfcGeomIterator.h"
+#include "../ifcgeom/IfcGeomFilter.h"
+#include "../ifcgeom/Iterator.h"
 
 #include <CGAL/box_intersection_d.h>
 #include <CGAL/minkowski_sum_3.h>
@@ -415,7 +415,7 @@ struct remove_thickness {
 
 
 struct intersection_validator {
-	typedef std::list<std::pair<IfcUtil::IfcBaseEntity*, CGAL::Nef_polyhedron_3<Kernel_>> > nefs_t;
+	typedef std::list<std::pair<const IfcUtil::IfcBaseEntity*, CGAL::Nef_polyhedron_3<Kernel_>> > nefs_t;
 	typedef CGAL::Box_intersection_d::Box_with_handle_d<double, 3, nefs_t::value_type*> Box;
 
 	std::vector<Box> boxes;
@@ -427,23 +427,23 @@ struct intersection_validator {
 	double total_minkowsky_time = 0.;
 	double total_box_time = 0.;
 
-	std::set<IfcUtil::IfcBaseEntity*> succesfully_processed;
+	std::set<const IfcUtil::IfcBaseEntity*> succesfully_processed;
 
 	intersection_validator(IfcParse::IfcFile& f, std::initializer_list<std::string> entities, double eps, bool no_progress, bool quiet, bool stderr_progress) {
 
-		ifcopenshell::geometry::settings settings;
-		settings.set(ifcopenshell::geometry::settings::USE_WORLD_COORDS, false);
-		settings.set(ifcopenshell::geometry::settings::WELD_VERTICES, false);
-		settings.set(ifcopenshell::geometry::settings::SEW_SHELLS, true);
-		settings.set(ifcopenshell::geometry::settings::CONVERT_BACK_UNITS, true);
-		settings.set(ifcopenshell::geometry::settings::DISABLE_TRIANGULATION, true);
-		settings.set(ifcopenshell::geometry::settings::DISABLE_OPENING_SUBTRACTIONS, true);
+		IfcGeom::IteratorSettings settings;
+		settings.set(IfcGeom::IteratorSettings::USE_WORLD_COORDS, false);
+		settings.set(IfcGeom::IteratorSettings::WELD_VERTICES, false);
+		settings.set(IfcGeom::IteratorSettings::SEW_SHELLS, true);
+		settings.set(IfcGeom::IteratorSettings::CONVERT_BACK_UNITS, true);
+		settings.set(IfcGeom::IteratorSettings::DISABLE_TRIANGULATION, true);
+		settings.set(IfcGeom::IteratorSettings::DISABLE_OPENING_SUBTRACTIONS, true);
 
 		std::vector<ifcopenshell::geometry::filter_t> spaces_and_walls = {
 			IfcGeom::entity_filter(true, false, entities)
 		};
 
-		ifcopenshell::geometry::Iterator context_iterator("cgal", settings, &f, spaces_and_walls);
+		IfcGeom::Iterator context_iterator("cgal", settings, &f, spaces_and_walls, 1);
 
 		if (!context_iterator.initialize()) {
 			return;
@@ -460,7 +460,7 @@ struct intersection_validator {
 			if (num_created) {
 				has_more = context_iterator.next();
 			}
-			ifcopenshell::geometry::NativeElement* geom_object = nullptr;
+			IfcGeom::BRepElement* geom_object = nullptr;
 			if (has_more) {
 				geom_object = context_iterator.get_native();
 			}
@@ -475,8 +475,8 @@ struct intersection_validator {
 
 			for (auto& g : geom_object->geometry()) {
 				auto s = ((ifcopenshell::geometry::CgalShape*) g.Shape())->shape();
-				const auto& m = *g.Placement().components;
-				const auto& n = *geom_object->transformation().data().components;
+				const auto& m = g.Placement().ccomponents();
+				const auto& n = geom_object->transformation().data().ccomponents();
 
 				const cgal_placement_t trsf(
 					m(0, 0), m(0, 1), m(0, 2), m(0, 3),
@@ -566,8 +566,11 @@ struct intersection_validator {
 				" objects                                ");
 		}
 
+		/*
+		// @todo
 		total_geom_time = context_iterator.converter().total_geom_time;
 		total_map_time = context_iterator.converter().total_map_time;
+		*/
 	}
 
 	template <typename Fn>