Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-16 21:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dont close polylines automatically

Browse Source
This commit is contained in:
Thomas Krijnen
2020-01-26 17:11:02 +01:00
parent b6a7ba1e1c
commit 7a8a5e2ebb
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/schema/mapping.cpp
+17 -10
View File
@@ -196,6 +196,8 @@ namespace {
} }
taxonomy::item* mapping::map_impl(const IfcSchema::IfcRepresentation* inst) { taxonomy::item* mapping::map_impl(const IfcSchema::IfcRepresentation* inst) {
const bool use_body = !this->settings_.get(ifcopenshell::geometry::settings::INCLUDE_CURVES);
auto items = map_to_collection(this, inst->Items()); auto items = map_to_collection(this, inst->Items());
if (items == nullptr) { if (items == nullptr) {
return nullptr; return nullptr;
@@ -204,9 +206,9 @@ taxonomy::item* mapping::map_impl(const IfcSchema::IfcRepresentation* inst) {
if (flat == nullptr) { if (flat == nullptr) {
return nullptr; return nullptr;
} }
auto filtered = filter(flat, [](taxonomy::item* i) { auto filtered = filter(flat, [&use_body](taxonomy::item* i) {
// @todo just filter loops for now. // @todo just filter loops for now.
return i->kind() != taxonomy::LOOP; return (i->kind() != taxonomy::LOOP) == use_body;
}); });
delete items; delete items;
delete flat; delete flat;
@@ -305,12 +307,14 @@ taxonomy::item* mapping::map_impl(const IfcSchema::IfcDirection* inst) {
} }
taxonomy::item* mapping::map_impl(const IfcSchema::IfcProduct* inst) { taxonomy::item* mapping::map_impl(const IfcSchema::IfcProduct* inst) {
const bool use_body = !this->settings_.get(ifcopenshell::geometry::settings::INCLUDE_CURVES);
auto openings = find_openings(inst); auto openings = find_openings(inst);
// @todo const cast // @todo const cast
auto reps = inst->data().file->traverse((IfcSchema::IfcProduct*) inst, 2)->as<IfcSchema::IfcRepresentation>(); auto reps = inst->data().file->traverse((IfcSchema::IfcProduct*) inst, 2)->as<IfcSchema::IfcRepresentation>();
IfcSchema::IfcRepresentation* body = nullptr; IfcSchema::IfcRepresentation* body = nullptr;
for (auto& rep : *reps) { for (auto& rep : *reps) {
if (rep->RepresentationIdentifier() == "Body") { if ((rep->RepresentationIdentifier() == "Body") == use_body) {
body = rep; body = rep;
} }
} }
@@ -321,7 +325,7 @@ taxonomy::item* mapping::map_impl(const IfcSchema::IfcProduct* inst) {
auto c = new taxonomy::collection; auto c = new taxonomy::collection;
c->matrix = as<taxonomy::matrix4>(map(inst->ObjectPlacement())); c->matrix = as<taxonomy::matrix4>(map(inst->ObjectPlacement()));
if (openings->size() && !settings_.get(settings::DISABLE_OPENING_SUBTRACTIONS)) { if (openings->size() && !settings_.get(settings::DISABLE_OPENING_SUBTRACTIONS) && use_body) {
auto ci = c->matrix.components.inverse(); auto ci = c->matrix.components.inverse();
IfcEntityList::ptr operands(new IfcEntityList); IfcEntityList::ptr operands(new IfcEntityList);
@@ -1113,13 +1117,15 @@ namespace {
taxonomy::loop* polygon_from_points(const std::vector<taxonomy::point3>& ps, bool external = true) { taxonomy::loop* polygon_from_points(const std::vector<taxonomy::point3>& ps, bool external = true) {
auto loop = new taxonomy::loop(); auto loop = new taxonomy::loop();
loop->external = external; loop->external = external;
auto previous = ps.back(); boost::optional<taxonomy::point3> previous;
for (auto& p : ps) { for (auto& p : ps) {
auto e = new taxonomy::edge; if (previous) {
e->start = previous; auto e = new taxonomy::edge;
e->end = p; e->start = *previous;
e->end = p;
loop->children.push_back(e);
}
previous = p; previous = p;
loop->children.push_back(e);
} }
return loop; return loop;
} }
@@ -1174,7 +1180,7 @@ namespace {
} }
std::vector<taxonomy::point3> ps; std::vector<taxonomy::point3> ps;
ps.reserve(points.size()); ps.reserve(points.size() + 1);
std::transform(points.begin(), points.end(), std::back_inserter(ps), [&has_position, &m4](const profile_point& p) { std::transform(points.begin(), points.end(), std::back_inserter(ps), [&has_position, &m4](const profile_point& p) {
if (has_position) { if (has_position) {
Eigen::Vector4d v(p.xy[0], p.xy[1], 0., 1.); Eigen::Vector4d v(p.xy[0], p.xy[1], 0., 1.);
@@ -1184,6 +1190,7 @@ namespace {
return taxonomy::point3(p.xy[0], p.xy[1], 0.); return taxonomy::point3(p.xy[0], p.xy[1], 0.);
} }
}); });
ps.push_back(ps.front());
return polygon_from_points(ps); return polygon_from_points(ps);
} }