Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-13 02:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catching some more CGAL errors, allow non-closed meshes, start of new code to triangulate faces

Browse Source
This commit is contained in:
Ken Arroyo Ohori
2017-04-21 15:43:19 +02:00
parent 9f2a617ad7
commit 164e67a50b
5 changed files with 117 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/kernels/cgal/CgalKernel.cpp
+30 -4
View File
@@ -290,8 +290,26 @@ bool IfcGeom::CgalKernel::convert_openings(const IfcSchema::IfcProduct* entity,
// fresult << polyhedron << std::endl;
// fresult.close();
CGAL::Nef_polyhedron_3<Kernel> nef_opening(opening);
nef_brep_cut_result -= nef_opening;
CGAL::Nef_polyhedron_3<Kernel> nef_opening;
try {
nef_opening = CGAL::Nef_polyhedron_3<Kernel>(opening);
} catch (...) {
Logger::Message(Logger::LOG_WARNING, "Subtracting combined openings compound failed (Nef conversion):", entity->entity);
std::ofstream ferror;
ferror.open("/Users/ken/Desktop/error.off");
ferror << entity_shape << std::endl;
ferror.close();
return false;
} try {
nef_brep_cut_result -= nef_opening;
} catch (...) {
Logger::Message(Logger::LOG_WARNING, "Subtracting combined openings compound failed (subtraction):", entity->entity);
std::ofstream ferror;
ferror.open("/Users/ken/Desktop/error.off");
ferror << entity_shape << std::endl;
ferror.close();
return false;
}
// brep_cut_result.convert_to_polyhedron(polyhedron);
// fresult.open("/Users/ken/Desktop/after.off");
@@ -307,14 +325,22 @@ bool IfcGeom::CgalKernel::convert_openings(const IfcSchema::IfcProduct* entity,
// Apparently processing the boolean operation failed or resulted in an invalid result
// in which case the original shape without the subtractions is returned instead
// we try convert the openings in the original way, one by one.
Logger::Message(Logger::LOG_WARNING, "Subtracting combined openings compound failed:", entity->entity);
Logger::Message(Logger::LOG_WARNING, "Subtracting combined openings compound failed (conversion):", entity->entity);
std::ofstream ferror;
ferror.open("/Users/ken/Desktop/error.off");
ferror << entity_shape << std::endl;
ferror.close();
return false;
}
} else {
// Apparently processing the boolean operation failed or resulted in an invalid result
// in which case the original shape without the subtractions is returned instead
// we try convert the openings in the original way, one by one.
Logger::Message(Logger::LOG_WARNING, "Subtracting combined openings compound failed:", entity->entity);
Logger::Message(Logger::LOG_WARNING, "Subtracting combined openings compound failed (invalid):", entity->entity);
std::ofstream ferror;
ferror.open("/Users/ken/Desktop/error.off");
ferror << entity_shape << std::endl;
ferror.close();
return false;
}