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

Fix placement on containment case

Browse Source
This commit is contained in:
Thomas Krijnen
2020-01-25 14:24:18 +01:00
parent 3575aded90
commit 030ea06aac
2 changed files with 82 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcconvert/validate_space_boundaries.cpp
+15 -17
View File
@@ -755,25 +755,23 @@ void fix_spaceboundaries(IfcParse::IfcFile& f, bool no_progress, bool quiet, boo
const auto& m = g.Placement().components; const auto& m = g.Placement().components;
const auto& n = geom_object->transformation().data().components; const auto& n = geom_object->transformation().data().components;
if (true || !m.isIdentity()) { const cgal_placement_t trsf(
const cgal_placement_t trsf( m(0, 0), m(0, 1), m(0, 2), m(0, 3),
m(0, 0), m(0, 1), m(0, 2), m(0, 3), m(1, 0), m(1, 1), m(1, 2), m(1, 3),
m(1, 0), m(1, 1), m(1, 2), m(1, 3), m(2, 0), m(2, 1), m(2, 2), m(2, 3));
m(2, 0), m(2, 1), m(2, 2), m(2, 3));
const cgal_placement_t trsf2( const cgal_placement_t trsf2(
n(0, 0), n(0, 1), n(0, 2), n(0, 3), n(0, 0), n(0, 1), n(0, 2), n(0, 3),
n(1, 0), n(1, 1), n(1, 2), n(1, 3), n(1, 0), n(1, 1), n(1, 2), n(1, 3),
n(2, 0), n(2, 1), n(2, 2), n(2, 3)); n(2, 0), n(2, 1), n(2, 2), n(2, 3));
// Apply transformation // Apply transformation
for (auto &vertex : vertices(s)) { for (auto &vertex : vertices(s)) {
vertex->point() = vertex->point().transform(trsf).transform(trsf2); vertex->point() = vertex->point().transform(trsf).transform(trsf2);
std::ostringstream ss; std::ostringstream ss;
ss << vertex->point().cartesian(0); ss << vertex->point().cartesian(0);
auto sss = ss.str(); auto sss = ss.str();
std::wcout << sss.c_str() << std::endl; std::wcout << sss.c_str() << std::endl;
}
} }
CGAL::Nef_polyhedron_3<Kernel_> nef; CGAL::Nef_polyhedron_3<Kernel_> nef;
src/ifcconvert/validate_storey_containment.cpp
+67 -90
View File
@@ -7,6 +7,10 @@
#include <algorithm> #include <algorithm>
class containment_validator {
};
void fix_storeycontainment(IfcParse::IfcFile& f, bool no_progress, bool quiet, bool stderr_progress) { void fix_storeycontainment(IfcParse::IfcFile& f, bool no_progress, bool quiet, bool stderr_progress) {
ifcopenshell::geometry::settings settings; ifcopenshell::geometry::settings settings;
settings.set(ifcopenshell::geometry::settings::USE_WORLD_COORDS, false); settings.set(ifcopenshell::geometry::settings::USE_WORLD_COORDS, false);
@@ -46,10 +50,17 @@ void fix_storeycontainment(IfcParse::IfcFile& f, bool no_progress, bool quiet, b
return get_elevation(a) < get_elevation(b); return get_elevation(a) < get_elevation(b);
}); });
std::wcout << "Storeys ";
for (auto& s : storeys_sorted) {
auto n = ((IfcUtil::IfcBaseEntity*)s)->get_value<std::string>("Name");
std::wcout << n.c_str() << " ";
}
std::wcout << std::endl;
std::vector<double> elevations; std::vector<double> elevations;
std::transform(storeys_sorted.begin(), storeys_sorted.end(), std::back_inserter(elevations), get_elevation); std::transform(storeys_sorted.begin(), storeys_sorted.end(), std::back_inserter(elevations), get_elevation);
double LARGE = 100; double LARGE = 1e4;
std::vector<std::pair<double, double>> elevation_slices; std::vector<std::pair<double, double>> elevation_slices;
for (size_t i = 0; i < elevations.size(); ++i) { for (size_t i = 0; i < elevations.size(); ++i) {
@@ -59,35 +70,28 @@ void fix_storeycontainment(IfcParse::IfcFile& f, bool no_progress, bool quiet, b
}); });
} }
std::vector<CGAL::Nef_polyhedron_3<Kernel_>> nefs; std::vector<CGAL::Nef_polyhedron_3<Kernel_>> nefs;
std::transform(elevation_slices.begin(), elevation_slices.end(), std::back_inserter(nefs), [&LARGE](const std::pair<double, double>& p) { std::transform(elevation_slices.begin(), elevation_slices.end(), std::back_inserter(nefs), [&LARGE](const std::pair<double, double>& p) {
std::wcout << p.first << " - " << p.second << std::endl;
Kernel_::Point_3 p1(-LARGE, -LARGE, p.first); Kernel_::Point_3 p1(-LARGE, -LARGE, p.first);
Kernel_::Point_3 p2(+LARGE, +LARGE, p.second); Kernel_::Point_3 p2(+LARGE, +LARGE, p.second);
auto poly = ifcopenshell::geometry::utils::create_cube(p1, p2); auto poly = ifcopenshell::geometry::utils::create_cube(p1, p2);
return ifcopenshell::geometry::utils::create_nef_polyhedron(poly);
auto bb = CGAL::Polygon_mesh_processing::bbox(poly);
std::wcout << "storey ";
for (int i = 0; i < 3; ++i) {
std::wcout << bb.min(i) << " ";
}
std::wcout << "- ";
for (int i = 0; i < 3; ++i) {
std::wcout << bb.max(i) << " ";
}
std::wcout << std::endl;
std::wcout << "volume " << CGAL::to_double(CGAL::Polygon_mesh_processing::volume(poly)) << std::endl;
auto nef = ifcopenshell::geometry::utils::create_nef_polyhedron(poly);
{
auto poly = ifcopenshell::geometry::utils::create_polyhedron(nef);
std::wcout << "volume " << CGAL::to_double(CGAL::Polygon_mesh_processing::volume(poly)) << std::endl;
}
return nef;
}); });
for (auto& n : nefs) {
auto poly = ifcopenshell::geometry::utils::create_polyhedron(n);
auto bounds = CGAL::Polygon_mesh_processing::bbox_3(poly);
for (int i = 0; i < 3; ++i) {
std::wcout << bounds.min(i) << std::endl;
}
for (int i = 0; i < 3; ++i) {
std::wcout << bounds.max(i) << std::endl;
}
std::wcout << "---" << std::endl;
}
if (!context_iterator.initialize()) { if (!context_iterator.initialize()) {
return; return;
} }
@@ -118,39 +122,39 @@ void fix_storeycontainment(IfcParse::IfcFile& f, bool no_progress, bool quiet, b
continue; continue;
} }
std::vector<double> intersection_volumes(nefs.size());
for (auto& g : geom_object->geometry()) { for (auto& g : geom_object->geometry()) {
auto s = ((ifcopenshell::geometry::CgalShape*) g.Shape())->shape(); auto s = ((ifcopenshell::geometry::CgalShape*) g.Shape())->shape();
const auto& m = g.Placement().components; const auto& m = g.Placement().components;
const auto& n = geom_object->transformation().data().components; const auto& n = geom_object->transformation().data().components;
if (!m.isIdentity()) { const cgal_placement_t trsf(
const cgal_placement_t trsf( m(0, 0), m(0, 1), m(0, 2), m(0, 3),
m(0, 0), m(0, 1), m(0, 2), m(0, 3), m(1, 0), m(1, 1), m(1, 2), m(1, 3),
m(1, 0), m(1, 1), m(1, 2), m(1, 3), m(2, 0), m(2, 1), m(2, 2), m(2, 3));
m(2, 0), m(2, 1), m(2, 2), m(2, 3));
const cgal_placement_t trsf2( const cgal_placement_t trsf2(
n(0, 0), n(0, 1), n(0, 2), n(0, 3), n(0, 0), n(0, 1), n(0, 2), n(0, 3),
n(1, 0), n(1, 1), n(1, 2), n(1, 3), n(1, 0), n(1, 1), n(1, 2), n(1, 3),
n(2, 0), n(2, 1), n(2, 2), n(2, 3)); n(2, 0), n(2, 1), n(2, 2), n(2, 3));
// Apply transformation // Apply transformation
for (auto &vertex : vertices(s)) { for (auto &vertex : vertices(s)) {
vertex->point() = vertex->point().transform(trsf).transform(trsf2); vertex->point() = vertex->point().transform(trsf).transform(trsf2);
}
{
auto bounds = CGAL::Polygon_mesh_processing::bbox_3(s);
for (int i = 0; i < 3; ++i) {
std::wcout << bounds.min(i) << std::endl;
} }
for (int i = 0; i < 3; ++i) {
std::wcout << bounds.max(i) << std::endl;
}
std::wcout << "---" << std::endl;
} }
auto bb = CGAL::Polygon_mesh_processing::bbox(s);
std::wcout << "elem ";
for (int i = 0; i < 3; ++i) {
std::wcout << bb.min(i) << " ";
}
std::wcout << "- ";
for (int i = 0; i < 3; ++i) {
std::wcout << bb.max(i) << " ";
}
std::wcout << std::endl;
CGAL::Nef_polyhedron_3<Kernel_> part_nef = ifcopenshell::geometry::utils::create_nef_polyhedron(s); CGAL::Nef_polyhedron_3<Kernel_> part_nef = ifcopenshell::geometry::utils::create_nef_polyhedron(s);
if (!part_nef.is_simple()) { if (!part_nef.is_simple()) {
@@ -158,53 +162,26 @@ void fix_storeycontainment(IfcParse::IfcFile& f, bool no_progress, bool quiet, b
continue; continue;
} }
std::wcout << "volume " << CGAL::to_double(CGAL::Polygon_mesh_processing::volume(s)) << std::endl; std::vector<double>::iterator accumulator;
std::for_each(nefs.begin(), nefs.end(), [&accumulator, &part_nef](const CGAL::Nef_polyhedron_3<Kernel_>& storey_nef) {
auto poly = ifcopenshell::geometry::utils::create_polyhedron(part_nef * storey_nef);
{ CGAL::Polygon_mesh_processing::triangulate_faces(poly);
auto poly = ifcopenshell::geometry::utils::create_polyhedron(part_nef); accumulator++ += CGAL::to_double(CGAL::Polygon_mesh_processing::volume(poly));
std::wcout << " part faces " << faces(poly).size() << " volume " << CGAL::to_double(CGAL::Polygon_mesh_processing::volume(poly)) << std::endl;
}
std::vector<double> intersection_volumes;
std::transform(nefs.begin(), nefs.end(), std::back_inserter(intersection_volumes), [&part_nef](const CGAL::Nef_polyhedron_3<Kernel_>& storey_nef) {
{
auto poly = ifcopenshell::geometry::utils::create_polyhedron(storey_nef);
std::wcout << " storey faces " << faces(poly).size() << " volume " << CGAL::to_double(CGAL::Polygon_mesh_processing::volume(poly)) << std::endl;
}
{
auto poly = ifcopenshell::geometry::utils::create_polyhedron(part_nef);
std::wcout << " part faces " << faces(poly).size() << " volume " << CGAL::to_double(CGAL::Polygon_mesh_processing::volume(poly)) << std::endl;
}
{
auto poly = ifcopenshell::geometry::utils::create_polyhedron(part_nef + storey_nef);
std::wcout << " faces " << faces(poly).size() << " volume " << CGAL::to_double(CGAL::Polygon_mesh_processing::volume(poly)) << std::endl;
}
{
auto poly = ifcopenshell::geometry::utils::create_polyhedron(part_nef - storey_nef);
std::wcout << " faces " << faces(poly).size() << " volume " << CGAL::to_double(CGAL::Polygon_mesh_processing::volume(poly)) << std::endl;
}
{
auto poly = ifcopenshell::geometry::utils::create_polyhedron(part_nef * storey_nef);
std::wcout << " faces " << faces(poly).size();
return CGAL::to_double(CGAL::Polygon_mesh_processing::volume(poly));
}
}); });
}
std::wcout << "volumes: "; std::wcout << "volumes: ";
for (auto& v : intersection_volumes) { for (auto& v : intersection_volumes) {
std::wcout << v << " "; std::wcout << v << " ";
} }
std::wcout << std::endl; std::wcout << std::endl;
auto idx = std::max_element(intersection_volumes.begin(), intersection_volumes.end()) - intersection_volumes.begin(); auto idx = std::max_element(intersection_volumes.begin(), intersection_volumes.end()) - intersection_volumes.begin();
if (storeys_sorted[idx] != elem_to_storey[geom_object->product()]) { if (storeys_sorted[idx] != elem_to_storey[geom_object->product()]) {
auto s = geom_object->product()->data().toString(); auto s = geom_object->product()->data().toString();
auto s1 = storeys_sorted[idx]->data().toString(); auto s1 = storeys_sorted[idx]->data().toString();
auto s2 = elem_to_storey[geom_object->product()]->data().toString(); auto s2 = elem_to_storey[geom_object->product()]->data().toString();
std::wcout << "Mismatch on " << s.c_str() << ": " << s1.c_str() << " vs " << s2.c_str() << std::endl; std::wcout << "Mismatch on " << s.c_str() << ": " << s1.c_str() << " vs " << s2.c_str() << std::endl;
}
} }
if (!no_progress) { if (!no_progress) {