Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-11 18:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement additional mappings

Browse Source
This commit is contained in:
Thomas Krijnen
2019-08-24 18:32:30 +02:00
parent 2f1861db7b
commit 26d7af1450
3 changed files with 161 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/schema/mapping.cpp
+99 -11
View File
@@ -70,7 +70,11 @@ namespace {
loop_to_face_upgrade(taxonomy::item* item) {
taxonomy::loop* loop = dynamic_cast<taxonomy::loop*>(item);
if (loop) {
face_ = taxonomy::face(loop->instance, loop->matrix, *loop);
face_ = taxonomy::face();
face_->instance = loop->instance;
face_->matrix = loop->matrix;
// @todo make sure loop is not freed
face_->children = { loop };
}
}
@@ -121,6 +125,23 @@ namespace {
delete item_;
}
};
template <typename U = taxonomy::collection, typename T>
U* map_to_collection(mapping* m, const T& ts) {
auto c = new U;
if (ts->size()) {
for (auto it = ts->begin(); it != ts->end(); ++it) {
if (auto r = m->map(*it)) {
c->children.push_back(r);
}
}
}
if (c->children.empty()) {
delete c;
return nullptr;
}
return c;
}
};
taxonomy::item* mapping::map(const IfcSchema::IfcExtrudedAreaSolid* inst) {
@@ -134,20 +155,82 @@ taxonomy::item* mapping::map(const IfcSchema::IfcExtrudedAreaSolid* inst) {
}
taxonomy::item* mapping::map(const IfcSchema::IfcRepresentation* inst) {
auto c = new taxonomy::collection();
IfcSchema::IfcRepresentationItem::list::ptr items = inst->Items();
if (items->size()) {
for (IfcSchema::IfcRepresentationItem::list::it it = items->begin(); it != items->end(); ++it) {
if (auto r = map(*it)) {
c->children.push_back(r);
return map_to_collection(this, inst->Items());
}
taxonomy::item* mapping::map(const IfcSchema::IfcFaceBasedSurfaceModel* inst) {
return map_to_collection(this, inst->FbsmFaces());
}
taxonomy::item* mapping::map(const IfcSchema::IfcConnectedFaceSet* inst) {
return map_to_collection<taxonomy::shell>(this, inst->CfsFaces());
}
taxonomy::item* mapping::map(const IfcSchema::IfcFace* inst) {
taxonomy::face* face = new taxonomy::face;
auto bounds = inst->Bounds();
for (auto& bound : *bounds) {
if (auto r = map(bound->Bound())) {
if (!bound->Orientation()) {
r->reverse();
}
}
face->children.push_back(r);
}
}
if (c->children.empty()) {
delete c;
if (face->children.empty()) {
delete face;
return nullptr;
}
return c;
return face;
}
taxonomy::item* mapping::map(const IfcSchema::IfcPolyLoop* inst) {
taxonomy::loop* loop = new taxonomy::loop;
taxonomy::point3 first, previous;
bool is_first = true;
auto points = inst->Polygon();
for (auto& point : *points) {
auto p = as<taxonomy::point3>(map(point));
if (is_first) {
previous = first = p;
is_first = false;
} else {
auto edge = new taxonomy::edge;
edge->start = previous;
edge->end = p;
loop->children.push_back(edge);
previous = p;
}
}
auto edge = new taxonomy::edge;
edge->start = previous;
edge->end = first;
loop->children.push_back(edge);
if (loop->children.size() < 3) {
Logger::Warning("Not enough edges for", inst);
delete loop;
return nullptr;
}
return loop;
}
taxonomy::item* mapping::map(const IfcSchema::IfcCartesianPoint* inst) {
auto coords = inst->Coordinates();
return new taxonomy::point3(
coords.size() >= 1 ? coords[0] : 0.,
coords.size() >= 2 ? coords[1] : 0.,
coords.size() >= 3 ? coords[2] : 0.
);
}
taxonomy::item* mapping::map(const IfcSchema::IfcProduct* inst) {
auto n = new taxonomy::node;
n->matrix = as<taxonomy::matrix4>(map(inst->ObjectPlacement()));
return n;
}
taxonomy::item* mapping::map(const IfcSchema::IfcAxis2Placement3D* inst) {
@@ -175,6 +258,11 @@ taxonomy::item* mapping::map(const IfcSchema::IfcCartesianTransformationOperator
return new taxonomy::matrix4();
}
taxonomy::item* mapping::map(const IfcSchema::IfcLocalPlacement* inst) {
// @todo length unit
return new taxonomy::matrix4();
}
IfcSchema::IfcProduct::list::ptr mapping::products_represented_by(const IfcSchema::IfcRepresentation* representation) {
IfcSchema::IfcProduct::list::ptr products(new IfcSchema::IfcProduct::list);
src/ifcgeom/schema/mapping.i
+8 -6
View File
@@ -24,8 +24,10 @@
* *
********************************************************************************/
BIND(IfcProduct);
// BIND(IfcShellBasedSurfaceModel);
// BIND(IfcFaceBasedSurfaceModel);
BIND(IfcFaceBasedSurfaceModel);
BIND(IfcRepresentation);
// BIND(IfcMappedItem);
// IfcFacetedBrep included
@@ -53,7 +55,7 @@ BIND(IfcRepresentation);
#endif
BIND(IfcExtrudedAreaSolid);
// BIND(IfcRevolvedAreaSolid);
// BIND(IfcConnectedFaceSet);
BIND(IfcConnectedFaceSet);
// BIND(IfcBooleanResult);
// BIND(IfcPolygonalBoundedHalfSpace);
// BIND(IfcHalfSpaceSolid);
@@ -91,7 +93,7 @@ BIND(IfcExtrudedAreaSolid);
// BIND(IfcDerivedProfileDef);
// IfcFaceSurface included
// IfcAdvancedFace included in case of IFC4
// BIND(IfcFace);
BIND(IfcFace);
// BIND(IfcEdgeCurve);
// BIND(IfcSubedge);
@@ -99,7 +101,7 @@ BIND(IfcExtrudedAreaSolid);
// BIND(IfcEdge);
// BIND(IfcEdgeLoop);
// BIND(IfcPolyline);
// BIND(IfcPolyLoop);
BIND(IfcPolyLoop);
// BIND(IfcCompositeCurve);
// BIND(IfcTrimmedCurve);
// BIND(IfcArbitraryOpenProfileDef);
@@ -115,7 +117,7 @@ BIND(IfcExtrudedAreaSolid);
// BIND(IfcBSplineCurveWithKnots);
#endif
// BIND(IfcCartesianPoint);
BIND(IfcCartesianPoint);
// BIND(IfcDirection);
// BIND(IfcAxis2Placement2D);
BIND(IfcAxis2Placement3D);
@@ -124,7 +126,7 @@ BIND(IfcCartesianTransformationOperator2DnonUniform);
BIND(IfcCartesianTransformationOperator3DnonUniform);
BIND(IfcCartesianTransformationOperator2D);
BIND(IfcCartesianTransformationOperator3D);
// BIND(IfcObjectPlacement);
BIND(IfcLocalPlacement);
// BIND(IfcVector);
// BIND(IfcPlane);
src/ifcgeom/taxonomy.h
+54 -47
View File
@@ -19,12 +19,18 @@ namespace geometry {
namespace taxonomy {
enum kinds { MATRIX4, POINT3, DIRECTION3, LINE, CIRCLE, ELLIPSE, BSPLINE, EDGE, LOOP, FACE, EXTRUSION, NODE, COLOUR, STYLE, COLLECTION };
class topology_error : public std::runtime_error {
public:
topology_error() : std::runtime_error("Generic topology error") {}
};
enum kinds { MATRIX4, POINT3, DIRECTION3, LINE, CIRCLE, ELLIPSE, BSPLINE, EDGE, LOOP, FACE, SHELL, EXTRUSION, NODE, COLOUR, STYLE, COLLECTION };
struct item {
const IfcUtil::IfcBaseClass* instance;
virtual item* clone() const = 0;
virtual kinds kind() const = 0;
virtual void reverse() { throw taxonomy::topology_error(); }
item(const IfcUtil::IfcBaseClass* instance = nullptr) : instance(instance) {}
@@ -98,14 +104,14 @@ struct point3 : public cartesian_base<3> {
virtual item* clone() const { return new point3(*this); }
virtual kinds kind() const { return POINT3; }
point3(double x, double y, double z = 0.) : cartesian_base(x, y, z) {}
point3(double x = 0., double y = 0., double z = 0.) : cartesian_base(x, y, z) {}
};
struct direction3 : public cartesian_base<3> {
virtual item* clone() const { return new direction3(*this); }
virtual kinds kind() const { return DIRECTION3; }
direction3(double x, double y, double z = 0.) : cartesian_base(x, y, z) {}
direction3(double x = 0., double y = 0., double z = 0.) : cartesian_base(x, y, z) {}
};
struct line : public geom_item {
@@ -133,46 +139,16 @@ typedef boost::variant<line, circle, ellipse, bspline> curve;
struct edge : public geom_item {
boost::variant<point3, double> start, end;
boost::optional<curve> basis;
bool orientation;
edge() : orientation(true) {}
virtual item* clone() const { return new edge(*this); }
virtual kinds kind() const { return EDGE; }
};
struct loop : public geom_item {
std::vector<edge> edges;
virtual item* clone() const { return new loop(*this); }
virtual kinds kind() const { return LOOP; }
};
struct face : public geom_item {
loop outer;
std::vector<loop> inner;
virtual item* clone() const { return new face(*this); }
virtual kinds kind() const { return FACE; }
face(const IfcUtil::IfcBaseClass* instance, loop o) : geom_item(instance), outer(o) {}
face(const IfcUtil::IfcBaseClass* instance, loop o, std::vector<loop> i) : geom_item(instance), outer(o), inner(i) {}
face(const IfcUtil::IfcBaseClass* instance, matrix4 m, loop o) : geom_item(instance, m), outer(o) {}
face(const IfcUtil::IfcBaseClass* instance, matrix4 m, loop o, std::vector<loop> i) : geom_item(instance, m), outer(o), inner(i) {}
};
struct sweep : public geom_item {
face basis;
sweep(face b) : basis(b) {}
sweep(matrix4 m, face b) : geom_item(m), basis(b) {}
};
struct extrusion : public sweep {
direction3 direction;
double depth;
virtual item* clone() const { return new extrusion(*this); }
virtual kinds kind() const { return EXTRUSION; }
extrusion(matrix4 m, face basis, direction3 dir, double d) : sweep(m, basis), direction(dir), depth(d) {}
virtual void reverse() {
std::swap(start, end);
orientation = !orientation;
}
};
struct collection : public geom_item {
@@ -180,6 +156,44 @@ struct collection : public geom_item {
virtual item* clone() const { return new collection(*this); }
virtual kinds kind() const { return COLLECTION; }
virtual void reverse() {
std::reverse(children.begin(), children.end());
for (auto& child : children) {
child->reverse();
}
}
};
struct shell : public collection {
virtual item* clone() const { return new shell(*this); }
virtual kinds kind() const { return SHELL; }
};
struct face : public collection {
virtual item* clone() const { return new face(*this); }
virtual kinds kind() const { return FACE; }
};
struct loop : public collection {
virtual item* clone() const { return new loop(*this); }
virtual kinds kind() const { return LOOP; }
};
struct sweep : public geom_item {
face basis;
sweep(face b) : basis(b) {}
sweep(matrix4 m, face b) : geom_item(m), basis(b) {}
};
struct extrusion : public sweep {
direction3 direction;
double depth;
virtual item* clone() const { return new extrusion(*this); }
virtual kinds kind() const { return EXTRUSION; }
extrusion(matrix4 m, face basis, direction3 dir, double d) : sweep(m, basis), direction(dir), depth(d) {}
};
struct node : public geom_item {
@@ -188,12 +202,10 @@ struct node : public geom_item {
virtual item* clone() const { return new node(*this); }
virtual kinds kind() const { return NODE; }
node(const IfcUtil::IfcBaseClass* instance, matrix4 m, const std::map<std::string, geom_item*>& representations, const std::vector<node*>& children) : geom_item(instance, m), representations(representations), children(children) {}
};
namespace impl {
typedef std::tuple<matrix4, point3, direction3, line, circle, ellipse, bspline, edge, loop, face, extrusion, node, collection> KindsTuple;
typedef std::tuple<matrix4, point3, direction3, line, circle, ellipse, bspline, edge, loop, face, shell, extrusion, node, collection> KindsTuple;
}
struct type_by_kind {
@@ -203,11 +215,6 @@ struct type_by_kind {
static const size_t max = std::tuple_size< impl::KindsTuple>::value;
};
class topology_error : public std::runtime_error {
public:
topology_error() : std::runtime_error("Generic topology error") {}
};
}