Schema independent layer and transformation conv functions

src/ifcgeom/IfcGeom.h

@@ -110,7 +110,7 @@ private:
 
 	std::map<int, SurfaceStyle> style_cache;
 
-	const SurfaceStyle* internalize_surface_style(const std::pair<IfcSchema::IfcSurfaceStyle*, IfcSchema::IfcSurfaceStyleShading*>& shading_style);
+	const SurfaceStyle* internalize_surface_style(const std::pair<IfcUtil::IfcBaseClass*, IfcUtil::IfcBaseClass*>& shading_style);
 
 	 // For stopping PlacementRelTo recursion in convert(const IfcSchema::IfcObjectPlacement* l, gp_Trsf& trsf)
 	const IfcParse::declaration* placement_rel_to;
@@ -224,9 +224,7 @@ public:
 
     static IfcSchema::IfcObjectDefinition* get_decomposing_entity(IfcSchema::IfcProduct*);
 
-    static std::map<std::string, IfcSchema::IfcPresentationLayerAssignment*> get_layers(IfcSchema::IfcProduct* prod);
-
-	template <typename P>
+    template <typename P>
     IfcGeom::BRepElement<P>* create_brep_for_representation_and_product(
         const IteratorSettings&, IfcSchema::IfcRepresentation*, IfcSchema::IfcProduct*);
 

src/ifcgeom/IfcGeomFunctions.cpp

@@ -1545,36 +1545,6 @@ IfcSchema::IfcObjectDefinition* IfcGeom::Kernel::get_decomposing_entity(IfcSchem
 	return parent;
 }
 
-std::map<std::string, IfcSchema::IfcPresentationLayerAssignment*> IfcGeom::Kernel::get_layers(IfcSchema::IfcProduct* prod)
-{
-	std::map<std::string, IfcSchema::IfcPresentationLayerAssignment*> layers;
-    if (prod->hasRepresentation()) {
-        IfcEntityList::ptr r = IfcParse::traverse(prod->Representation());
-		IfcSchema::IfcRepresentation::list::ptr representations = r->as<IfcSchema::IfcRepresentation>();
-        for (IfcSchema::IfcRepresentation::list::it it = representations->begin(); it != representations->end(); ++it) {
-			IfcSchema::IfcPresentationLayerAssignment::list::ptr a = (*it)->LayerAssignments();
-            for (IfcSchema::IfcPresentationLayerAssignment::list::it jt = a->begin(); jt != a->end(); ++jt) {
-                layers[(*jt)->Name()] = *jt;
-            }
-        }
-
-		IfcSchema::IfcRepresentationItem::list::ptr items = r->as<IfcSchema::IfcRepresentationItem>();
-        for (IfcSchema::IfcRepresentationItem::list::it it = items->begin(); it != items->end(); ++it) {
-			IfcSchema::IfcPresentationLayerAssignment::list::ptr a = (*it)->
-                // LayerAssignments renamed from plural to singular, LayerAssignment, so work around that
-#ifdef USE_IFC4
-                LayerAssignment();
-#else
-                LayerAssignments();
-#endif
-            for (IfcSchema::IfcPresentationLayerAssignment::list::it jt = a->begin(); jt != a->end(); ++jt) {
-                layers[(*jt)->Name()] = *jt;
-            }
-        }
-    }
-    return layers;
-}
-
 template IFC_GEOM_API IfcGeom::BRepElement<float>* IfcGeom::Kernel::create_brep_for_representation_and_product<float>(
     const IteratorSettings& settings, IfcSchema::IfcRepresentation* representation, IfcSchema::IfcProduct* product);
 template IFC_GEOM_API IfcGeom::BRepElement<double>* IfcGeom::Kernel::create_brep_for_representation_and_product<double>(

src/ifcgeom/IfcGeomRenderStyles.cpp

@@ -56,7 +56,7 @@ namespace {
 
 #define Kernel MAKE_TYPE_NAME(Kernel)
 
-const IfcGeom::SurfaceStyle* IfcGeom::Kernel::internalize_surface_style(const std::pair<IfcSchema::IfcSurfaceStyle*, IfcSchema::IfcSurfaceStyleShading*>& shading_styles) {
+const IfcGeom::SurfaceStyle* IfcGeom::Kernel::internalize_surface_style(const std::pair<IfcUtil::IfcBaseClass*, IfcUtil::IfcBaseClass*>& shading_styles) {
 	if (shading_styles.second == 0) {
 		return 0;
 	}
@@ -66,13 +66,17 @@ const IfcGeom::SurfaceStyle* IfcGeom::Kernel::internalize_surface_style(const st
 		return &(it->second);
 	}
 	SurfaceStyle surface_style;
-	if (shading_styles.first->hasName()) {
-		surface_style = SurfaceStyle(surface_style_id, shading_styles.first->Name());
+
+	IfcSchema::IfcSurfaceStyle* style = shading_styles.first->as<IfcSchema::IfcSurfaceStyle>();
+	IfcSchema::IfcSurfaceStyleShading* shading = shading_styles.second->as<IfcSchema::IfcSurfaceStyleShading>();
+
+	if (style->hasName()) {
+		surface_style = SurfaceStyle(surface_style_id, style->Name());
 	} else {
 		surface_style = SurfaceStyle(surface_style_id);
 	}
 	double rgb[3];
-	if (process_colour(shading_styles.second->SurfaceColour(), rgb)) {
+	if (process_colour(shading->SurfaceColour(), rgb)) {
 		surface_style.Diffuse().reset(SurfaceStyle::ColorComponent(rgb[0], rgb[1], rgb[2]));
 	}
 	if (shading_styles.second->declaration().is(IfcSchema::IfcSurfaceStyleRendering::Class())) {

src/ifcgeom_schema_agnostic/Kernel.h

@@ -5,12 +5,25 @@
 #include "../ifcgeom/IfcGeomIteratorSettings.h"
 #include "../ifcgeom/IfcRepresentationShapeItem.h"
 
+#include "../ifcparse/Ifc2x3.h"
+#include "../ifcparse/Ifc4.h"
+
 #include <boost/function.hpp>
 
 #include <TopExp_Explorer.hxx>
 
 namespace IfcGeom {
 
+	namespace impl {
+		// LayerAssignments renamed from plural to singular, LayerAssignment, so work around that
+		IfcEntityList::ptr getLayerAssignments(Ifc2x3::IfcRepresentationItem* item) {
+			return item->LayerAssignments()->generalize();
+		}
+		IfcEntityList::ptr getLayerAssignments(Ifc4::IfcRepresentationItem* item) {
+			return item->LayerAssignment()->generalize();
+		}
+	}
+
 	template <typename T>
 	class BRepElement;
 
@@ -76,7 +89,36 @@ namespace IfcGeom {
 			return implementation_->convert(item);
 		}
 
+		virtual bool convert(IfcUtil::IfcBaseClass* item, gp_Trsf& trsf) {
+			return implementation_->convert(item, trsf);
+		}
+
 		static int count(const TopoDS_Shape&, TopAbs_ShapeEnum);
+
+		template <typename Schema>
+		static std::map<std::string, typename Schema::IfcPresentationLayerAssignment*> get_layers(typename Schema::IfcProduct* prod) {
+			std::map<std::string, Schema::IfcPresentationLayerAssignment*> layers;
+			if (prod->hasRepresentation()) {
+				IfcEntityList::ptr r = IfcParse::traverse(prod->Representation());
+				Schema::IfcRepresentation::list::ptr representations = r->as<Schema::IfcRepresentation>();
+				for (Schema::IfcRepresentation::list::it it = representations->begin(); it != representations->end(); ++it) {
+					Schema::IfcPresentationLayerAssignment::list::ptr a = (*it)->LayerAssignments();
+					for (Schema::IfcPresentationLayerAssignment::list::it jt = a->begin(); jt != a->end(); ++jt) {
+						layers[(*jt)->Name()] = *jt;
+					}
+				}
+
+				Schema::IfcRepresentationItem::list::ptr items = r->as<Schema::IfcRepresentationItem>();
+				for (Schema::IfcRepresentationItem::list::it it = items->begin(); it != items->end(); ++it) {
+					Schema::IfcPresentationLayerAssignment::list::ptr a = impl::getLayerAssignments(*it)->as<Schema::IfcPresentationLayerAssignment>();
+					for (Schema::IfcPresentationLayerAssignment::list::it jt = a->begin(); jt != a->end(); ++jt) {
+						layers[(*jt)->Name()] = *jt;
+					}
+				}
+			}
+			return layers;
+		}
+
 	};
 
 	namespace impl {