Drastic settings refactoring

src/serializers/ColladaSerializer.cpp

@@ -409,7 +409,7 @@ void ColladaSerializer::ColladaExporter::write(const IfcGeom::TriangulationEleme
 	DeferredObject deferred(name, representation_id, o->type(), o->transformation(), mesh.verts(), mesh.normals(),
 		mesh.faces(), mesh.edges(), mesh.material_ids(), mesh.materials(), material_references, mesh.uvs());
 
-	if (serializer->settings().get(SerializerSettings::USE_ELEMENT_HIERARCHY)) {
+	if (serializer->geometry_settings().get<ifcopenshell::geometry::settings::UseElementHierarchy>().get()) {
 		deferred.parents() = o->parents();
 	}
 
@@ -451,7 +451,7 @@ std::string ColladaSerializer::differentiateSlabTypes(const IfcUtil::IfcBaseEnti
 
 std::string ColladaSerializer::object_id(const IfcGeom::Element* o) /*override*/
 {
-    if (settings_.get(SerializerSettings::USE_ELEMENT_TYPES)) {
+    if (settings_.get<ifcopenshell::geometry::settings::UseElementTypes>().get()) {
         const std::string slabSuffix = (o->product() && o->product()->declaration().name() == "IfcSlab")
             ? differentiateSlabTypes(o->product())
             : "";
@@ -464,7 +464,7 @@ void ColladaSerializer::ColladaExporter::endDocument() {
 	// In fact due the XML based nature of Collada and its dependency on library nodes,
 	// only at this point all objects are written to the stream.
 	materials.write();
-	bool use_hierarchy = serializer->settings().get(SerializerSettings::USE_ELEMENT_HIERARCHY);
+	bool use_hierarchy = serializer->geometry_settings().get<ifcopenshell::geometry::settings::UseElementHierarchy>().get();
 	
 	std::set<std::string> geometries_written;
 

src/serializers/ColladaSerializer.h

@@ -219,9 +219,9 @@ private:
 	std::string unit_name;
 	float unit_magnitude;
 public:
-    ColladaSerializer(const std::string& dae_filename, const SerializerSettings& settings)
-        : WriteOnlyGeometrySerializer(settings)
-		, exporter("IfcOpenShell", dae_filename, this, settings.precision >= 15)
+    ColladaSerializer(const std::string& dae_filename, const ifcopenshell::geometry::Settings& geometry_settings, const ifcopenshell::geometry::SerializerSettings& settings)
+        : WriteOnlyGeometrySerializer(geometry_settings, settings)
+		, exporter("IfcOpenShell", dae_filename, this, settings.get<ifcopenshell::geometry::settings::FloatingPointDigits>().get() >= 15)
     {
         exporter.serializer = this;
         exporter.materials.serializer = this;

src/serializers/GltfSerializer.cpp

@@ -44,8 +44,8 @@ static const uint32_t PRIM_TRIANGLES = 4;
 static const uint32_t PRIM_TRIANGLE_STRIP = 5;
 static const uint32_t PRIM_TRIANGLE_FAN = 6;
 
-GltfSerializer::GltfSerializer(const std::string& filename, const SerializerSettings& settings)
-	: WriteOnlyGeometrySerializer(settings)
+GltfSerializer::GltfSerializer(const std::string& filename, const ifcopenshell::geometry::Settings& geometry_settings, const ifcopenshell::geometry::SerializerSettings& settings)
+	: WriteOnlyGeometrySerializer(geometry_settings, settings)
 	, filename_(filename)
 	, tmp_filename1_(filename + ".indices.tmp")
 	, tmp_filename2_(filename + ".vertices.tmp")

src/serializers/GltfSerializer.h

@@ -39,7 +39,7 @@ private:
 
 	int writeMaterial(const ifcopenshell::geometry::taxonomy::style& style);
 public:
-	GltfSerializer(const std::string& filename, const SerializerSettings& settings);
+	GltfSerializer(const std::string& filename, const ifcopenshell::geometry::Settings& geometry_settings, const ifcopenshell::geometry::SerializerSettings& settings);
 	virtual ~GltfSerializer();
 	bool ready();
 	void writeHeader();

src/serializers/HdfSerializer.cpp

@@ -53,8 +53,8 @@ herr_t print_stack(hid_t /*estack*/, void*) {
 	return 0;
 }
 
-HdfSerializer::HdfSerializer(const std::string& hdf_filename, const SerializerSettings& settings, bool read_only)
-	: GeometrySerializer(settings)
+HdfSerializer::HdfSerializer(const std::string& hdf_filename, const ifcopenshell::geometry::Settings& geometry_settings, const ifcopenshell::geometry::SerializerSettings& settings, bool read_only)
+	: GeometrySerializer(geometry_settings, settings)
 	, hdf_filename(hdf_filename)
 	, settings_(settings)
 {
@@ -284,7 +284,6 @@ IfcGeom::Element* HdfSerializer::read(IfcParse::IfcFile& f, const std::string& g
 	auto representation_group = element_group.openGroup(representation_id_str);
 	std::string geom_id = read_scalar_attribute<std::string>(representation_group, "geom_id");
 
-	IfcGeom::ElementSettings element_settings(settings_, f.getUnit("LENGTHUNIT").second, type);
 	auto inst = f.instance_by_id(id)->as<IfcUtil::IfcBaseEntity>();
 
 	boost::shared_ptr<IfcGeom::Representation::BRep> brep_geometry;
@@ -305,6 +304,9 @@ IfcGeom::Element* HdfSerializer::read(IfcParse::IfcFile& f, const std::string& g
 	if (rt == READ_BREP && !brep_geometry) {
 		auto brepDataset = representation_group.openDataSet(DATASET_NAME_OCCT);
 		
+		/*
+		// @todo
+
 		static const auto ignored_settings =
 			// Settings that do not affect storage of brep data
 			IfcGeom::IteratorSettings::DISABLE_TRIANGULATION | IfcGeom::IteratorSettings::USE_BREP_DATA |
@@ -325,6 +327,7 @@ IfcGeom::Element* HdfSerializer::read(IfcParse::IfcFile& f, const std::string& g
 		if (stored_settings != requested_settings && (stored_settings | IfcGeom::IteratorSettings::USE_WORLD_COORDS) != requested_settings) {
 			throw std::runtime_error("Settings mismatch");
 		}
+		*/
 
 		std::vector<brep_element> parts;
 		{
@@ -357,6 +360,9 @@ IfcGeom::Element* HdfSerializer::read(IfcParse::IfcFile& f, const std::string& g
 			shapes.push_back(IfcGeom::ConversionResult(part.id, matrix, new ifcopenshell::geometry::OpenCascadeShape(shp), style_ptr));
 		}
 
+		/*
+		// @todo
+
 		// World coordinates can be applied post-hoc
 		if (settings_.get(IfcGeom::IteratorSettings::USE_WORLD_COORDS) && !(stored_settings & IfcGeom::IteratorSettings::USE_WORLD_COORDS)) {
 			for (IfcGeom::ConversionResults::iterator it = shapes.begin(); it != shapes.end(); ++it) {
@@ -364,13 +370,16 @@ IfcGeom::Element* HdfSerializer::read(IfcParse::IfcFile& f, const std::string& g
 			}
 			trsf = ifcopenshell::geometry::taxonomy::make<ifcopenshell::geometry::taxonomy::matrix4>();
 		}
+		*/
 
-		brep_geometry = boost::shared_ptr<IfcGeom::Representation::BRep>(new IfcGeom::Representation::BRep(element_settings, geom_id, shapes));
-
+		brep_geometry = boost::shared_ptr<IfcGeom::Representation::BRep>(new IfcGeom::Representation::BRep(geometry_settings(), type, geom_id, shapes));
 
+		/*
+		// @todo
 		if (!settings_.get(IfcGeom::IteratorSettings::USE_WORLD_COORDS)) {
 			brep_cache_.insert({ representation_id_str, brep_geometry });
 		}
+		*/
 	}
 	
 	if (rt == READ_TRIANGULATION && !triangulation_geometry) {
@@ -413,7 +422,8 @@ IfcGeom::Element* HdfSerializer::read(IfcParse::IfcFile& f, const std::string& g
 		}
 
 		triangulation_geometry = boost::shared_ptr<IfcGeom::Representation::Triangulation>(new IfcGeom::Representation::Triangulation(
-			element_settings,
+			geometry_settings_,
+			type,
 			geom_id,
 			verts,
 			faces,
@@ -432,7 +442,7 @@ IfcGeom::Element* HdfSerializer::read(IfcParse::IfcFile& f, const std::string& g
 	} else {
 		return new IfcGeom::TriangulationElement(
 			IfcGeom::Element(
-				element_settings,
+				geometry_settings_,
 				id,
 				parent_id,
 				name,
@@ -619,7 +629,11 @@ void HdfSerializer::write(const IfcGeom::BRepElement* o) {
 
 	H5::DataSpace attrdspace(H5S_SCALAR);
 	H5::Attribute att = brepDataset.createAttribute("settings", H5::PredType::NATIVE_UINT64, attrdspace);
+	/*
+	// @todo
 	uint64_t value = o->geometry().settings().get_raw();
+	*/
+	uint64_t value = 0;
 	att.write(H5::PredType::NATIVE_UINT64, &value);
 }
 

src/serializers/HdfSerializer.h

@@ -38,7 +38,7 @@ private:
 	const std::string hdf_filename;
 	unsigned int vcount_total;
 	H5::H5File file;
-	SerializerSettings settings_;
+	ifcopenshell::geometry::SerializerSettings settings_;
 
 	static const H5std_string DATASET_NAME_POSITIONS;
 	static const H5std_string DATASET_NAME_UVCOORDS;
@@ -92,7 +92,7 @@ private:
 	void write_style(surface_style_serialization& data, const ifcopenshell::geometry::taxonomy::style& s);
 
 public:
-	HdfSerializer(const std::string& hdf_filename, const SerializerSettings& settings, bool read_only=false);
+	HdfSerializer(const std::string& hdf_filename, const ifcopenshell::geometry::Settings& geometry_settings, const ifcopenshell::geometry::SerializerSettings& settings, bool read_only=false);
 	virtual ~HdfSerializer() {}
 	bool ready();
 	void writeHeader();

src/serializers/IgesSerializer.h

@@ -40,8 +40,8 @@ private:
 public:
     /// @note IGESControl_Controller::Init() must be called prior to instantiating IgesSerializer.
     /// See http://tracker.dev.opencascade.org/view.php?id=23679 for more information.
-    IgesSerializer(const std::string& out_filename, const SerializerSettings& settings)
-        : OpenCascadeBasedSerializer(out_filename, settings)
+    IgesSerializer(const std::string& out_filename, const ifcopenshell::geometry::Settings& geometry_settings, const ifcopenshell::geometry::SerializerSettings& settings)
+        : OpenCascadeBasedSerializer(out_filename, geometry_settings, settings)
 	{}
 	virtual ~IgesSerializer() {}
 	void writeShape(const std::string&, const TopoDS_Shape& shape) {

src/serializers/OpenCascadeBasedSerializer.h

@@ -36,8 +36,8 @@ protected:
 	const std::string out_filename;
 	const char* getSymbolForUnitMagnitude(float mag);
 public:
-	explicit OpenCascadeBasedSerializer(const std::string& out_filename, const SerializerSettings& settings)
-		: WriteOnlyGeometrySerializer(settings)
+	explicit OpenCascadeBasedSerializer(const std::string& out_filename, const ifcopenshell::geometry::Settings& geometry_settings, const ifcopenshell::geometry::SerializerSettings& settings)
+		: WriteOnlyGeometrySerializer(geometry_settings, settings)
 		, out_filename(out_filename)
 	{}
 	virtual ~OpenCascadeBasedSerializer() {}

src/serializers/StepSerializer.h

@@ -34,8 +34,8 @@ class StepSerializer : public OpenCascadeBasedSerializer
 private:
 	STEPControl_Writer writer;	
 public:
-	explicit StepSerializer(const std::string& out_filename, const SerializerSettings& settings)
-		: OpenCascadeBasedSerializer(out_filename, settings)
+	explicit StepSerializer(const std::string& out_filename, const ifcopenshell::geometry::Settings& geometry_settings, const ifcopenshell::geometry::SerializerSettings& serializer_settings)
+		: OpenCascadeBasedSerializer(out_filename, geometry_settings, serializer_settings)
 	{}
 	virtual ~StepSerializer() {}
 	void writeShape(const std::string& name, const TopoDS_Shape& shape) {

src/serializers/SvgSerializer.cpp

@@ -311,7 +311,7 @@ void SvgSerializer::write(path_object& p, const TopoDS_Shape& comp_or_wire, boos
 				ycoords.push_back(path.add(p2.Y()));
 			} else if (ty != STANDARD_TYPE(Geom_Line)) {
 				BRepAdaptor_Curve crv(edge);
-				GCPnts_QuasiUniformDeflection tessellater(crv, settings().deflection_tolerance());
+				GCPnts_QuasiUniformDeflection tessellater(crv, geometry_settings().get<ifcopenshell::geometry::settings::MesherLinearDeflection>().get());
 				// NB: Start at 2: 1-based and skip the first point, assume it coincides with p1.
 				for (int i = 2; i <= tessellater.NbPoints(); ++i) {
 					gp_Pnt pi = tessellater.Value(i);
@@ -379,9 +379,8 @@ namespace {
 		for (const auto& p : o->parents()) {
 			if (p->type() == "IfcBuildingStorey") {
 				try {
-					const IfcGeom::ElementSettings& settings = o->geometry().settings();
 					double e = *p->product()->get("Elevation");
-					double storey_elevation = e * settings.unit_magnitude();
+					double storey_elevation = e * o->geometry().settings().get<ifcopenshell::geometry::settings::LengthUnit>().get();
 					return std::make_pair(p->product(), storey_elevation);
 				} catch (...) {
 					continue;
@@ -1883,7 +1882,7 @@ void SvgSerializer::addTextAnnotations(const drawing_key& k) {
 				auto desc = (std::string) *ds;
 
 				if (object_type == "Text") {
-					auto mapping = ifcopenshell::geometry::impl::mapping_implementations().construct(file, settings_);
+					auto mapping = ifcopenshell::geometry::impl::mapping_implementations().construct(file, geometry_settings_);
 					auto item = mapping->map(*pl);
 					auto matrix = ifcopenshell::geometry::taxonomy::cast<ifcopenshell::geometry::taxonomy::matrix4>(item);
 					delete mapping;
@@ -2307,11 +2306,11 @@ std::string SvgSerializer::nameElement(const IfcUtil::IfcBaseEntity* storey, con
 std::string SvgSerializer::idElement(const IfcUtil::IfcBaseEntity* elem) {
 	const std::string type = elem->declaration().is("IfcBuildingStorey") ? "storey" : "product";
 	const std::string name =
-		(settings().get(SerializerSettings::USE_ELEMENT_GUIDS)
+		(settings().get<ifcopenshell::geometry::settings::UseElementGuids>().get()
 			? static_cast<std::string>(*elem->get("GlobalId"))
-			: ((settings().get(SerializerSettings::USE_ELEMENT_NAMES) && !elem->get("Name")->isNull()))
+			: ((settings().get<ifcopenshell::geometry::settings::UseElementNames>().get() && !elem->get("Name")->isNull()))
 			? static_cast<std::string>(*elem->get("Name"))
-			: (settings().get(SerializerSettings::USE_ELEMENT_STEPIDS))
+			: (settings().get<ifcopenshell::geometry::settings::UseElementStepIds>().get())
 			? ("id-" + boost::lexical_cast<std::string>(elem->data().id()))
 			: IfcParse::IfcGlobalId(*elem->get("GlobalId")).formatted());
 	return type + "-" + name;
@@ -2340,7 +2339,7 @@ void SvgSerializer::setFile(IfcParse::IfcFile* f) {
 
 	auto storeys = f->instances_by_type("IfcBuildingStorey");
 	if (!storeys || storeys->size() == 0) {
-		auto mapping = ifcopenshell::geometry::impl::mapping_implementations().construct(file, settings_);
+		auto mapping = ifcopenshell::geometry::impl::mapping_implementations().construct(file, geometry_settings_);
 
 		std::vector<const IfcParse::declaration*> to_derive_from;
 		to_derive_from.push_back(f->schema()->declaration_by_name("IfcBuilding"));

src/serializers/SvgSerializer.h

@@ -196,8 +196,8 @@ protected:
 	subtract_before_project subtraction_settings_;
 
 public:
-	SvgSerializer(const stream_or_filename& out_filename, const SerializerSettings& settings)
-		: WriteOnlyGeometrySerializer(settings)
+	SvgSerializer(const stream_or_filename& out_filename, const ifcopenshell::geometry::Settings& geometry_settings, const ifcopenshell::geometry::SerializerSettings& settings)
+		: WriteOnlyGeometrySerializer(geometry_settings, settings)
 		, svg_file(out_filename)
 		, xmin(+std::numeric_limits<double>::infinity())
 		, ymin(+std::numeric_limits<double>::infinity())

src/serializers/WavefrontObjSerializer.cpp

@@ -27,14 +27,14 @@
 #include <boost/lexical_cast.hpp>
 #include <iomanip>
 
-WaveFrontOBJSerializer::WaveFrontOBJSerializer(const stream_or_filename& obj_filename, const stream_or_filename& mtl_filename, const SerializerSettings& settings)
-	: WriteOnlyGeometrySerializer(settings)
+WaveFrontOBJSerializer::WaveFrontOBJSerializer(const stream_or_filename& obj_filename, const stream_or_filename& mtl_filename, const ifcopenshell::geometry::Settings& geometry_settings, const ifcopenshell::geometry::SerializerSettings& settings)
+	: WriteOnlyGeometrySerializer(geometry_settings, settings)
 	, obj_stream(obj_filename)
 	, mtl_stream(mtl_filename)
 	, vcount_total(1)
 {
-	obj_stream.stream << std::setprecision(settings.precision);
-	mtl_stream.stream << std::setprecision(settings.precision);
+	obj_stream.stream << std::setprecision(settings.get<ifcopenshell::geometry::settings::FloatingPointDigits>().get());
+	mtl_stream.stream << std::setprecision(settings.get<ifcopenshell::geometry::settings::FloatingPointDigits>().get());
 }
 
 bool WaveFrontOBJSerializer::ready() {
@@ -91,7 +91,7 @@ void WaveFrontOBJSerializer::write(const IfcGeom::TriangulationElement* o)
 {
     obj_stream.stream << "g " << object_id(o) << "\n";
 	obj_stream.stream << "s 1" << "\n";
-	const bool isyup = settings().get(SerializerSettings::USE_Y_UP);
+	const bool isyup = settings().get<ifcopenshell::geometry::settings::UseYUp>().get();
 
     const IfcGeom::Representation::Triangulation& mesh = o->geometry();
 

src/serializers/WavefrontObjSerializer.h

@@ -35,7 +35,7 @@ private:
 	unsigned int vcount_total;
 	std::set<std::string> materials;
 public:
-	WaveFrontOBJSerializer(const stream_or_filename& obj_filename, const stream_or_filename& mtl_filename, const SerializerSettings& settings);
+	WaveFrontOBJSerializer(const stream_or_filename& obj_filename, const stream_or_filename& mtl_filename, const ifcopenshell::geometry::Settings& geometry_settings, const ifcopenshell::geometry::SerializerSettings& settings);
 	virtual ~WaveFrontOBJSerializer() {}
 	bool ready();
 	void writeHeader();

src/serializers/schema_dependent/XmlSerializer.h

@@ -35,7 +35,7 @@ private:
 	IfcParse::IfcFile* file;
 
 	// @todo
-	IfcGeom::IteratorSettings settings_;
+	ifcopenshell::geometry::Settings settings_;
 	ifcopenshell::geometry::abstract_mapping* mapping_;
 
 public: